Re: [PATCH for 2.6.22] [6/10] x86: Only make Macintosh drivers default on Macs

[Olaf Hering]

On Thu, Jun 21, Olaf Hering wrote:

> On Wed, Jun 20, Andi Kleen wrote:

> > It's already annoying that they appear on x86 now -- that's for the 3button
> > emulation needed on x86 macs -- but at least don't make them default.

> > +++ linux/drivers/macintosh/Kconfig
> > @@ -2,7 +2,7 @@
> >  menuconfig MACINTOSH_DRIVERS
> >  	bool "Macintosh device drivers"
> >  	depends on PPC || MAC || X86
> > -	default y
> > +	default y if MAC
> 
> This looks incorrect because my macdrivers were almost gone now when
> updating from 2.6.21 to 2.6.22. 
> A better one may be something like this, to not lose everything on a G5:

This one works. 
Without it, every previously enabled option will default to N during
make oldconfig.
With it, every previously enabled option remains the same because make
oldcconfig does not touch them.



Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 0852d33..dbe9626 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -2,7 +2,7 @@
 menuconfig MACINTOSH_DRIVERS
 	bool "Macintosh device drivers"
 	depends on PPC || MAC || X86
-	default y if MAC
+	default y if (PPC_PMAC || MAC)
 
 if MACINTOSH_DRIVERS
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/