summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pcmcia
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-10-19 14:09:44 +0200
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-11-01 16:15:23 +0100
commit3eb2ebcb8e8d2e57d7a9f21ffe1dc82bf0322bdc (patch)
treebc2d5b9b1435358d4b8c13073825a4229a3e31f8 /drivers/scsi/pcmcia
parentMerge tag 'nfsd-4.20' of git://linux-nfs.org/~bfields/linux (diff)
downloadlinux-3eb2ebcb8e8d2e57d7a9f21ffe1dc82bf0322bdc.tar.xz
linux-3eb2ebcb8e8d2e57d7a9f21ffe1dc82bf0322bdc.zip
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>
Diffstat (limited to 'drivers/scsi/pcmcia')
-rw-r--r--drivers/scsi/pcmcia/aha152x_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pcmcia/aha152x_core.c b/drivers/scsi/pcmcia/aha152x_core.c
index dba3716511c5..24b89228b241 100644
--- a/drivers/scsi/pcmcia/aha152x_core.c
+++ b/drivers/scsi/pcmcia/aha152x_core.c
@@ -1,3 +1,3 @@
-#define PCMCIA 1
+#define AHA152X_PCMCIA 1
#define AHA152X_STAT 1
#include "aha152x.c"