Author: gordon-guest Date: Fri Apr 20 05:18:58 2007 New Revision: 8493 Added: dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options2.patch dists/sid/linux-2.6/debian/patches/series/3 Modified: dists/sid/linux-2.6/debian/changelog Log: arm: Mark CONFIG_MTD_NAND_CAFE and CONFIG_NETXEN_NIC as broken to fix FTBFS.
Modified: dists/sid/linux-2.6/debian/changelog ============================================================================== --- dists/sid/linux-2.6/debian/changelog (original) +++ dists/sid/linux-2.6/debian/changelog Fri Apr 20 05:18:58 2007 @@ -1,3 +1,10 @@ +linux-2.6 (2.6.20-3) UNRELEASED; urgency=low + + * arm: Mark CONFIG_MTD_NAND_CAFE and CONFIG_NETXEN_NIC as broken to + fix FTBFS. + + -- Gordon Farquharson <[EMAIL PROTECTED]> Thu, 19 Apr 2007 23:06:26 -0600 + linux-2.6 (2.6.20-2) unstable; urgency=low [ Bastian Blank ] Added: dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options2.patch ============================================================================== --- (empty file) +++ dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options2.patch Fri Apr 20 05:18:58 2007 @@ -0,0 +1,24 @@ +diff -Naur linux-2.6-2.6.20.orig/drivers/mtd/nand/Kconfig linux-2.6-2.6.20/drivers/mtd/nand/Kconfig +--- linux-2.6-2.6.20.orig/drivers/mtd/nand/Kconfig 2007-02-04 11:44:54.000000000 -0700 ++++ linux-2.6-2.6.20/drivers/mtd/nand/Kconfig 2007-04-18 22:02:18.000000000 -0600 +@@ -223,7 +223,7 @@ + + config MTD_NAND_CAFE + tristate "NAND support for OLPC CAFÉ chip" +- depends on PCI ++ depends on PCI && (!ARM || BROKEN) + help + Use NAND flash attached to the CAFÉ chip designed for the $100 + laptop. +diff -Naur linux-2.6-2.6.20.orig/drivers/net/Kconfig linux-2.6-2.6.20/drivers/net/Kconfig +--- linux-2.6-2.6.20.orig/drivers/net/Kconfig 2007-04-18 22:16:48.000000000 -0600 ++++ linux-2.6-2.6.20/drivers/net/Kconfig 2007-04-18 22:16:29.000000000 -0600 +@@ -2484,7 +2484,7 @@ + + config NETXEN_NIC + tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC" +- depends on PCI && (!SPARC32 || BROKEN) ++ depends on PCI && (!SPARC32 || BROKEN) && (!ARM || BROKEN) + help + This enables the support for NetXen's Gigabit Ethernet card. + Added: dists/sid/linux-2.6/debian/patches/series/3 ============================================================================== --- (empty file) +++ dists/sid/linux-2.6/debian/patches/series/3 Fri Apr 20 05:18:58 2007 @@ -0,0 +1 @@ ++ bugfix/arm/disable-broken-config-options2.patch _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
