r2829 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11: config debian

[Sven Luther]

Author: luther
Date: 2005-03-26 20:22:24 +0000 (Sat, 26 Mar 2005)
New Revision: 2829

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/common.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/power3.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/power4.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/powerpc.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/debian/changelog
Log:
Moved powerbook config option to powerpc only, since there are no power3 or
power4 powerbooks yet, and this options breaks power3/power4 build.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/common.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/common.stub	2005-03-26 15:17:17 UTC (rev 2828)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/common.stub	2005-03-26 20:22:24 UTC (rev 2829)
@@ -472,7 +472,6 @@
 #
 CONFIG_ADB=y
 CONFIG_ADB_PMU=y
-CONFIG_PMAC_PBOOK=y
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_BACKLIGHT=y
 CONFIG_INPUT_ADBHID=y

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/power3.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/power3.stub	2005-03-26 15:17:17 UTC (rev 2828)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/power3.stub	2005-03-26 20:22:24 UTC (rev 2829)
@@ -7,3 +7,4 @@
 CONFIG_THERM_WINDTUNNEL=m
 CONFIG_THERM_ADT746X=m
 CONFIG_ANSLCD=m
+# CONFIG_PMAC_PBOOK is not set

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/power4.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/power4.stub	2005-03-26 15:17:17 UTC (rev 2828)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/power4.stub	2005-03-26 20:22:24 UTC (rev 2829)
@@ -5,3 +5,4 @@
 CONFIG_PPC64BRIDGE=y
 CONFIG_PPC_PMAC64=y
 CONFIG_THERM_PM72=y
+# CONFIG_PMAC_PBOOK is not set

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/powerpc.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/powerpc.stub	2005-03-26 15:17:17 UTC (rev 2828)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/config/powerpc.stub	2005-03-26 20:22:24 UTC (rev 2829)
@@ -12,4 +12,4 @@
 CONFIG_THERM_WINDTUNNEL=m
 CONFIG_THERM_ADT746X=m
 CONFIG_ANSLCD=m
-
+CONFIG_PMAC_PBOOK=y

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/debian/changelog	2005-03-26 15:17:17 UTC (rev 2828)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.11-2.6.11/debian/changelog	2005-03-26 20:22:24 UTC (rev 2829)
@@ -2,7 +2,7 @@
 
   * New Upstream release.
 
- -- Sven Luther <luther@debian.org>  Sat,  5 Mar 2005 12:17:20 +0100
+ -- Sven Luther <luther@debian.org>  Sat, 26 Mar 2005 21:20:29 +0100
 
 kernel-patch-powerpc-2.6.10 (2.6.10-3) unstable; urgency=high