Skip to contentSkip to conversation

simplify i386 mca Kconfig bits

PATCH In review Christoph Hellwig 2 participants 4 messages Aug 5, 2003

lore
Share & tools
lore
author
#1 lore raw

I should better attach the patch :)

include/linux/mca.h +2 -2
diff -Nru a/include/linux/mca.h b/include/linux/mca.h
@@ -10,9 +10,9 @@
  * included mca.h to compile.  Take it out later when the MCA #includes
  * are sorted out */
 #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
author
#2 lore raw
Quoted 1 line · Christoph Hellwig

I should better attach the patch :)

*grr*, actually that was the next patch (also for inclusion) that fixes drivers that include <linux/mca.h> on arches that don't have mca.

Here's the right one, finally.

arch/i386/Kconfig +2 -5
@@ -1104,16 +1104,13 @@
 
 config MCA
 	bool "MCA support"
-	depends on !(X86_VISWS || X86_VOYAGER)
+	depends on !X86_VISWS
+	default y if X86_VOYAGER
 	help
 	  MicroChannel Architecture is found in some IBM PS/2 machines and
 	  laptops.  It is a bus system similar to PCI or ISA. See
 	  <file:Documentation/mca.txt> (and especially the web page given
 	  there) before attempting to build an MCA bus kernel.
-
-config MCA
-	depends on X86_VOYAGER
-	default y if X86_VOYAGER
 
 source "drivers/mca/Kconfig"
#3 lore raw

Hi,

Quoted 8 lines · Christoph Hellwig
arch/i386/Kconfig +1 -1
@@ -1104,16 +1104,13 @@
 
 config MCA
 	bool "MCA support"
-	depends on !(X86_VISWS || X86_VOYAGER)
+	depends on !X86_VISWS

arch/i386/Kconfig line 1116

Quoted 10 lines
arch/i386/Kconfig +1 -4
+	default y if X86_VOYAGER
 	help
 	  MicroChannel Architecture is found in some IBM PS/2 machines and
 	  laptops.  It is a bus system similar to PCI or ISA. See
 	  <file:Documentation/mca.txt> (and especially the web page given
 	  there) before attempting to build an MCA bus kernel.
-
-config MCA
-	depends on X86_VOYAGER
-	default y if X86_VOYAGER

This is not really the same as before, e.g. this might be better:

config MCA

	bool "MCA support" if !(X86_VISWS || X86_VOYAGER)
	default y if X86_VOYAGER

or you could do this:

config X86_VOYAGER
bool "Voyager (NCR)"
select MCA

config MCA
bool "MCA support"
depends on !X86_VISWS

bye, Roman