r4235 - in dists/trunk/linux-2.6/debian: . arch/powerpc

[Sven Luther]

Author: luther
Date: 2005-09-17 19:34:29 +0000 (Sat, 17 Sep 2005)
New Revision: 4235

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
   dists/trunk/linux-2.6/debian/changelog
Log:
Same for trunk.


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-17 19:17:52 UTC (rev 4234)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-17 19:34:29 UTC (rev 4235)
@@ -460,7 +460,7 @@
 CONFIG_R8169_VLAN=y
 CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
-# CONFIG_TIGON3 is not set
+CONFIG_TIGON3=m
 CONFIG_BNX2=m
 CONFIG_MV643XX_ETH=m
 # CONFIG_MV643XX_ETH_0 is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	2005-09-17 19:17:52 UTC (rev 4234)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	2005-09-17 19:34:29 UTC (rev 4235)
@@ -1,5 +1,4 @@
 CONFIG_64BIT=y
-# CONFIG_ADB is not set
 CONFIG_AUDITSYSCALL=y
 CONFIG_COMPAT=y
 CONFIG_CPUSETS=y
@@ -13,6 +12,7 @@
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_PLATINUM is not set
 # CONFIG_FB_VALKYRIE is not set
+# CONFIG_FB_NVIDIA is not set
 CONFIG_FORCE_MAX_ZONEORDER=13
 # CONFIG_GEN_RTC is not set
 CONFIG_HANGCHECK_TIMER=m
@@ -57,7 +57,6 @@
 CONFIG_SECCOMP=y
 # CONFIG_SERIAL_ICOM is not set
 CONFIG_SMP=y
-# CONFIG_SND_POWERMAC is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_THERM_PM72=y

Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-09-17 19:17:52 UTC (rev 4234)
+++ dists/trunk/linux-2.6/debian/changelog	2005-09-17 19:34:29 UTC (rev 4235)
@@ -74,8 +74,10 @@
   * [powerpc] Added hotplug support to the mv643xx_eth driver :
       powerpc-mv643xx-hotplug-support.patch
     thanks go to Nicolas Det for providing the patch.
+  * [powerpc] Modified a couple of configuration options for the powerpc64
+    flavour, fixes and enhances Apple G5 support (Closes: #323724, #328324)
 
- -- Sven Luther <luther at debian.org>  Thu, 15 Sep 2005 14:27:53 +0200
+ -- Sven Luther <luther at debian.org>  Sat, 17 Sep 2005 21:27:00 +0200
 
 linux-2.6 (2.6.12-6) unstable; urgency=high