diff options
| author | Matthew Wilcox <willy@debian.org> | 2004-06-17 18:00:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-17 18:00:41 -0700 |
| commit | 261efef31f15fff88ce6bddc760971565e8017f7 (patch) | |
| tree | 79b3b6bcc7f80cca7d22c430bda50d4abf017584 | |
| parent | 2765df29514dbed2554e0e0c64aafdbdbbf2582a (diff) | |
[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 <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/linux/mca.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 <linux/device.h> /* get the platform specific defines */ +#ifdef CONFIG_MCA #include <asm/mca.h> +#endif /* The detection of MCA bus is done in the real mode (using BIOS). * The information is exported to the protected code, where this |