[PATCH] simplify i386 mca Kconfig bits

[PATCH] simplify i386 mca Kconfig bits

[Christoph Hellwig]

Re: [PATCH] simplify i386 mca Kconfig bits

[Christoph Hellwig]

I should better attach the patch :)


diff -Nru a/include/linux/mca.h b/include/linux/mca.h
--- a/include/linux/mca.h	Sun Jul 13 05:23:15 2003
+++ b/include/linux/mca.h	Sun Jul 13 05:23:15 2003
@@ -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

Re: [PATCH] simplify i386 mca Kconfig bits

[Christoph Hellwig]

On Tue, Aug 05, 2003 at 01:33:51PM +0200, Christoph Hellwig wrote:
> 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.


--- 1.62/arch/i386/Kconfig	Thu Jun 19 19:06:56 2003
+++ edited/arch/i386/Kconfig	Tue Jun 24 21:31:52 2003
@@ -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"
 

Re: [PATCH] simplify i386 mca Kconfig bits

[Roman Zippel]

Hi,

On Tue, 5 Aug 2003, Christoph Hellwig wrote:

> --- 1.62/arch/i386/Kconfig	Thu Jun 19 19:06:56 2003
> +++ edited/arch/i386/Kconfig	Tue Jun 24 21:31:52 2003
> @@ -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

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