From ce6d00ae529130c7e50ebe73982ae2fe34dc2dd0 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 4 Dec 2009 17:41:15 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config: Set DUMMY. svn path=/dists/trunk/linux-2.6/; revision=14734 --- debian/changelog | 1 + debian/config/alpha/config | 1 - debian/config/armel/config.iop32x | 1 - debian/config/armel/config.ixp4xx | 1 - debian/config/armel/config.versatile | 1 - debian/config/config | 1 + debian/config/hppa/config | 1 - debian/config/m68k/config | 1 - debian/config/mips/config.4kc-malta | 1 - debian/config/mips/config.5kc-malta | 1 - debian/config/mips/config.r4k-ip22 | 1 - debian/config/mips/config.r5k-ip32 | 1 - debian/config/mips/config.sb1-bcm91250a | 1 - debian/config/mips/config.sb1a-bcm91480b | 1 - debian/config/mipsel/config.r5k-cobalt | 1 - debian/config/powerpc/config | 1 - debian/config/s390/config | 1 - debian/config/sparc/config | 1 - 18 files changed, 2 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6cea7db67..6eb4182c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ linux-2.6 (2.6.32-1) UNRELEASED; urgency=low * Always enable complete USB mass storage support. * [amd64, powerpc, sparc] Build USB support as module. * [amd64] Build AGP support as module. + * Always enable dummy net driver support. [ Ben Hutchings ] * Re-enable accidentally omitted drivers, thanks to Uwe Kleine-König diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 9c15acd3c..f0ded349e 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -643,7 +643,6 @@ CONFIG_MTD_NAND=m ## ## file: drivers/net/Kconfig ## -CONFIG_DUMMY=m CONFIG_NET_SB1000=m CONFIG_HAPPYMEAL=m CONFIG_SUNGEM=m diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 02fcf59eb..4a41d28fa 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -454,7 +454,6 @@ CONFIG_MTD_NAND=m ## file: drivers/net/Kconfig ## CONFIG_NETDEVICES=y -CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 05d6a783d..fd010e1c6 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -444,7 +444,6 @@ CONFIG_MTD_NAND=m ## file: drivers/net/Kconfig ## CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 864c82a72..1dfc50d26 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -233,7 +233,6 @@ CONFIG_TABLET_USB_WACOM=m ## file: drivers/net/Kconfig ## CONFIG_IFB=m -CONFIG_DUMMY=m CONFIG_NET_ETHERNET=y # CONFIG_AX88796 is not set # CONFIG_HAPPYMEAL is not set diff --git a/debian/config/config b/debian/config/config index 93a5fcb76..3d187f256 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1287,6 +1287,7 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 ## CONFIG_NETDEVICES=y CONFIG_IFB=m +CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_MACVLAN=m CONFIG_EQUALIZER=m diff --git a/debian/config/hppa/config b/debian/config/hppa/config index f4d7f519a..f0122711f 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -227,7 +227,6 @@ CONFIG_I2O_PROC=m ## ## file: drivers/net/Kconfig ## -CONFIG_DUMMY=m # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set CONFIG_LASI_82596=m diff --git a/debian/config/m68k/config b/debian/config/m68k/config index b6db3f8ca..0041e3bbc 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -109,7 +109,6 @@ CONFIG_MD=y ## file: drivers/net/Kconfig ## CONFIG_NETDEVICES=y -CONFIG_DUMMY=m # CONFIG_BONDING is not set CONFIG_EQUALIZER=m # CONFIG_TUN is not set diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index ff78ba019..4dfd1dc67 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -824,7 +824,6 @@ CONFIG_MTD_ONENAND_VERIFY_WRITE=y ## CONFIG_NETDEVICES=y CONFIG_IFB=m -CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 6731af1f9..97c448ddb 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1030,7 +1030,6 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 ## CONFIG_NETDEVICES=y CONFIG_IFB=m -CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index 5bcb19eb9..8b52e15b3 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -315,7 +315,6 @@ CONFIG_VIDEO_VINO=m ## file: drivers/net/Kconfig ## CONFIG_NETDEVICES=y -CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index c3cbe3116..47a850ed9 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -363,7 +363,6 @@ CONFIG_VIDEO_DEV=m ## file: drivers/net/Kconfig ## CONFIG_NETDEVICES=y -CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 2b5a07aba..3f3b68193 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -463,7 +463,6 @@ CONFIG_USB_ET61X251=m ## file: drivers/net/Kconfig ## CONFIG_NETDEVICES=y -CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 7a0e2617f..d5ca66695 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -493,7 +493,6 @@ CONFIG_USB_ET61X251=m ## file: drivers/net/Kconfig ## CONFIG_NETDEVICES=y -CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 671510061..35c99f446 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -454,7 +454,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0 ## file: drivers/net/Kconfig ## CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set CONFIG_BONDING=m # CONFIG_EQUALIZER is not set CONFIG_TUN=m diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index ca64e797d..aadba1d06 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -471,7 +471,6 @@ CONFIG_MMC_BLOCK=m ## ## file: drivers/net/Kconfig ## -CONFIG_DUMMY=m CONFIG_MACE=m # CONFIG_MACE_AAUI_PORT is not set CONFIG_BMAC=m diff --git a/debian/config/s390/config b/debian/config/s390/config index 4d7723601..1110e0a5c 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -61,7 +61,6 @@ CONFIG_S390_PRNG=m ## ## file: drivers/net/Kconfig ## -# CONFIG_DUMMY is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 4173fa09e..762614c30 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -287,7 +287,6 @@ CONFIG_VIDEO_BT848=m ## ## file: drivers/net/Kconfig ## -CONFIG_DUMMY=m CONFIG_SUNLANCE=m CONFIG_HAPPYMEAL=m CONFIG_SUNBMAC=m