From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759624AbXFURw0 (ORCPT ); Thu, 21 Jun 2007 13:52:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757581AbXFURv7 (ORCPT ); Thu, 21 Jun 2007 13:51:59 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:49231 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757218AbXFURv6 (ORCPT ); Thu, 21 Jun 2007 13:51:58 -0400 Date: Thu, 21 Jun 2007 19:52:00 +0200 From: Olaf Hering To: Andi Kleen Cc: torvalds@osdl.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH for 2.6.22] [6/10] x86: Only make Macintosh drivers default on Macs Message-ID: <20070621175200.GA22507@aepfle.de> References: <200706201223.443613000@suse.de> <20070620102334.DD01814AD0@wotan.suse.de> <20070621173628.GA21243@aepfle.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20070621173628.GA21243@aepfle.de> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 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