diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64 index 1e7258486..bc5395615 100644 --- a/debian/arch/powerpc/config.powerpc64 +++ b/debian/arch/powerpc/config.powerpc64 @@ -109,4 +109,6 @@ CONFIG_SPIDER_NET=m 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 + diff --git a/debian/arch/powerpc/vserver/config.powerpc64 b/debian/arch/powerpc/vserver/config.powerpc64 index ef12c794c..8a6e73760 100644 --- a/debian/arch/powerpc/vserver/config.powerpc64 +++ b/debian/arch/powerpc/vserver/config.powerpc64 @@ -108,3 +108,4 @@ CONFIG_SPIDER_NET=m # CONFIG_LPARCFG is not set CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_MIGRATION=y +# CONFIG_MV643XX_ETH is not set diff --git a/debian/changelog b/debian/changelog index a2be3861a..4e32edc5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ linux-2.6 (2.6.18-1) UNRELEASED; urgency=low 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 @@ linux-2.6 (2.6.18-1) UNRELEASED; urgency=low * Enable CONFIG_PRINTER=m for all powerpc flavours. * Enable the new alsa CONFIG_SND_AOA framework for powerpc. - -- Bastian Blank Wed, 20 Sep 2006 12:09:47 +0200 + -- Sven Luther Wed, 20 Sep 2006 19:00:51 +0200 linux-2.6 (2.6.17-8) UNRELEASED; urgency=low diff --git a/debian/patches/series/1 b/debian/patches/series/1 index 6d6853578..d4c59f7e5 100644 --- a/debian/patches/series/1 +++ b/debian/patches/series/1 @@ -30,4 +30,3 @@ + arm-get_unaligned-gcc41-const.patch + powerpc-serial.patch + powerpc-oldworld-boot-fix.patch -+ bugfix/powerpc/mv643-define.patch