From 261efef31f15fff88ce6bddc760971565e8017f7 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Thu, 17 Jun 2004 18:00:41 -0700 Subject: [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: Andrew Morton Signed-off-by: Linus Torvalds --- include/linux/mca.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/mca.h b/include/linux/mca.h index 554bbcf71dca6..a80124c4a05d6 100644 --- a/include/linux/mca.h +++ b/include/linux/mca.h @@ -12,7 +12,9 @@ #include /* get the platform specific defines */ +#ifdef CONFIG_MCA #include +#endif /* The detection of MCA bus is done in the real mode (using BIOS). * The information is exported to the protected code, where this -- cgit 1.2.3-korg