Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: aha152x: rename the PCMCIA define

We plan to enable building the PCMCIA core and drivers, and the
non-prefixed PCMCIA name clashes with some arch headers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

authored by

Christoph Hellwig and committed by
Masahiro Yamada
3eb2ebcb 310c7585

+8 -8
+7 -7
drivers/scsi/aha152x.c
··· 269 269 /* DEFINES */ 270 270 271 271 /* For PCMCIA cards, always use AUTOCONF */ 272 - #if defined(PCMCIA) || defined(MODULE) 272 + #if defined(AHA152X_PCMCIA) || defined(MODULE) 273 273 #if !defined(AUTOCONF) 274 274 #define AUTOCONF 275 275 #endif ··· 297 297 298 298 #define DELAY_DEFAULT 1000 299 299 300 - #if defined(PCMCIA) 300 + #if defined(AHA152X_PCMCIA) 301 301 #define IRQ_MIN 0 302 302 #define IRQ_MAX 16 303 303 #else ··· 328 328 MODULE_DESCRIPTION(AHA152X_REVID); 329 329 MODULE_LICENSE("GPL"); 330 330 331 - #if !defined(PCMCIA) 331 + #if !defined(AHA152X_PCMCIA) 332 332 #if defined(MODULE) 333 333 static int io[] = {0, 0}; 334 334 module_param_hw_array(io, int, ioport, NULL, 0); ··· 391 391 MODULE_DEVICE_TABLE(isapnp, id_table); 392 392 #endif /* ISAPNP */ 393 393 394 - #endif /* !PCMCIA */ 394 + #endif /* !AHA152X_PCMCIA */ 395 395 396 396 static struct scsi_host_template aha152x_driver_template; 397 397 ··· 863 863 if (shpnt->irq) 864 864 free_irq(shpnt->irq, shpnt); 865 865 866 - #if !defined(PCMCIA) 866 + #if !defined(AHA152X_PCMCIA) 867 867 if (shpnt->io_port) 868 868 release_region(shpnt->io_port, IO_RANGE); 869 869 #endif ··· 2924 2924 .slave_alloc = aha152x_adjust_queue, 2925 2925 }; 2926 2926 2927 - #if !defined(PCMCIA) 2927 + #if !defined(AHA152X_PCMCIA) 2928 2928 static int setup_count; 2929 2929 static struct aha152x_setup setup[2]; 2930 2930 ··· 3392 3392 __setup("aha152x=", aha152x_setup); 3393 3393 #endif 3394 3394 3395 - #endif /* !PCMCIA */ 3395 + #endif /* !AHA152X_PCMCIA */
+1 -1
drivers/scsi/pcmcia/aha152x_core.c
··· 1 - #define PCMCIA 1 1 + #define AHA152X_PCMCIA 1 2 2 #define AHA152X_STAT 1 3 3 #include "aha152x.c"