r4234 - in dists/sid/linux-2.6/debian: . arch/powerpc

[Sven Luther]

Author: luther
Date: 2005-09-17 19:17:52 +0000 (Sat, 17 Sep 2005)
New Revision: 4234

Modified:
   dists/sid/linux-2.6/debian/arch/powerpc/config
   dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64
   dists/sid/linux-2.6/debian/changelog
Log:
Enabled TG3 builds on powerpc, removed nvidiafb for powerpc64 as it caused
boot to die, and added snd_pmac for powerpc64.


Modified: dists/sid/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config	2005-09-17 10:41:40 UTC (rev 4233)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config	2005-09-17 19:17:52 UTC (rev 4234)
@@ -576,7 +576,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/sid/linux-2.6/debian/arch/powerpc/config.powerpc64
===================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64	2005-09-17 10:41:40 UTC (rev 4233)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64	2005-09-17 19:17:52 UTC (rev 4234)
@@ -1,5 +1,4 @@
 CONFIG_64BIT=y
-# CONFIG_ADB is not set
 CONFIG_AUDITSYSCALL=y
 CONFIG_COMPAT=y
 CONFIG_CPUSETS=y
@@ -14,6 +13,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/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-09-17 10:41:40 UTC (rev 4233)
+++ dists/sid/linux-2.6/debian/changelog	2005-09-17 19:17:52 UTC (rev 4234)
@@ -1,21 +1,23 @@
 linux-2.6 (2.6.12-7) UNRELEASED; urgency=low
 
   [ Simon Horman ]
-  * [SECURITY] THe seq_file memory leak fix included in 2.6.12-6
+  * [SECURITY] The seq_file memory leak fix included in 2.6.12-6
     as part of upstream's 2.6.12.6 patchset is now CAN-2005-2800.
 
   [ Sven Luther ]
   * [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)
 
   [ Jurij Smakov ]
   * Backport of dpt_i2o SCSI driver fixes from 2.6.13 to take care
     of panics with some Adaptec cards: driver-scsi-dpt_i2o-fixes.patch.
     See patch header for details and references. (closes: #328534)
-  
- -- Sven Luther <luther at debian.org>  Thu, 15 Sep 2005 14:16:19 +0200
 
+ -- Sven Luther <luther at debian.org>  Sat, 17 Sep 2005 21:14:40 +0200
+
 linux-2.6 (2.6.12-6) unstable; urgency=high
 
   [ Andres Salomon, Bastian Blank ]