[kernel] r7470 - in dists/trunk/linux-2.6/debian: . arch/powerpc arch/powerpc/vserver patches/series

[Sven Luther]

Author: luther
Date: Wed Sep 20 17:06:24 2006
New Revision: 7470

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
   dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1

Log:
mv643xx_eth is only ever useful on 32bit, sodisable its built on powerpc64, where it caused build problem.
backing out Bastian patch which is thus no more needed.


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	Wed Sep 20 17:06:24 2006
@@ -109,4 +109,6 @@
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_MIGRATION=y
 CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
+# CONFIG_MV643XX_ETH is not set
+
 

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64	Wed Sep 20 17:06:24 2006
@@ -108,3 +108,4 @@
 # CONFIG_LPARCFG is not set
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_MIGRATION=y
+# CONFIG_MV643XX_ETH is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Sep 20 17:06:24 2006
@@ -25,6 +25,8 @@
     Herrenschmidt for providing the patch. (Closes: #366620, #375035).
   * [powerpc] Fixes hvc_console caused suspsend-to-disk breakage. Thanks to
     Andrew Morton for providing the patch. (Closes: #387178)
+  * [powerpc] Disabled mv643xx_eth on powerpc64 flavours, as there never was a
+    Marvell Discovery northbrige for 64bit powerpc cpus.
 
   [ Frederik Schüler ]
   * Remove obsolete options from amd64 and i386 configs.
@@ -36,7 +38,7 @@
   * Enable CONFIG_PRINTER=m for all powerpc flavours.
   * Enable the new alsa CONFIG_SND_AOA framework for powerpc.
 
- -- Bastian Blank <waldi at debian.org>  Wed, 20 Sep 2006 12:09:47 +0200
+ -- Sven Luther <sven at tael.powerlinux.fr>  Wed, 20 Sep 2006 19:00:51 +0200
 
 linux-2.6 (2.6.17-8) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/patches/series/1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1	Wed Sep 20 17:06:24 2006
@@ -30,4 +30,3 @@
 + arm-get_unaligned-gcc41-const.patch
 + powerpc-serial.patch
 + powerpc-oldworld-boot-fix.patch
-+ bugfix/powerpc/mv643-define.patch