Commit 261efef3 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

[PATCH] ahc1542 !CONFIG_MCA build fix

The old 1542 scsi driver is both ISA and MCA.  The MCA portions are disabled
when !CONFIG_MCA through the typical wrapper scheme (a la pci.h and
!CONFIG_PCI).  However...  the driver unconditionally includes linux/mca.h
which in turn unconditionally includes asm/mca.h.

This breaks drivers on platforms with ISA but not MCA, like alpha.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2765df29
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
#include <linux/device.h> #include <linux/device.h>
/* get the platform specific defines */ /* get the platform specific defines */
#ifdef CONFIG_MCA
#include <asm/mca.h> #include <asm/mca.h>
#endif
/* The detection of MCA bus is done in the real mode (using BIOS). /* The detection of MCA bus is done in the real mode (using BIOS).
* The information is exported to the protected code, where this * The information is exported to the protected code, where this
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment