[kernel] r14745 - in dists/trunk/linux-2.6/debian/config: alpha armel m68k mips mipsel
Bastian Blank
waldi at alioth.debian.org
Sun Dec 6 19:57:09 UTC 2009
Author: waldi
Date: Sun Dec 6 19:57:07 2009
New Revision: 14745
Log:
debian/config/alpha, debian/config/armel, debian/config/m68k,
debian/config/mips, debian/config/mipsel: Remove duplicated options.
Modified:
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/armel/config.iop32x
dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
dists/trunk/linux-2.6/debian/config/armel/config.orion5x
dists/trunk/linux-2.6/debian/config/armel/config.versatile
dists/trunk/linux-2.6/debian/config/m68k/config
dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Sun Dec 6 19:57:07 2009 (r14745)
@@ -1005,10 +1005,6 @@
CONFIG_USB_SISUSBVGA=m
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x Sun Dec 6 19:57:07 2009 (r14745)
@@ -312,24 +312,6 @@
# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
##
-## file: drivers/md/Kconfig
-##
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-
-##
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
@@ -618,10 +600,6 @@
CONFIG_USB_SISUSBVGA=m
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
# CONFIG_FB is not set
Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Sun Dec 6 19:57:07 2009 (r14745)
@@ -692,10 +692,6 @@
CONFIG_USB_SL811_HCD=m
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
# CONFIG_FB is not set
Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Sun Dec 6 19:57:07 2009 (r14745)
@@ -603,10 +603,6 @@
CONFIG_USB_SISUSBVGA=m
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=m
Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x Sun Dec 6 19:57:07 2009 (r14745)
@@ -579,10 +579,6 @@
CONFIG_USB_SISUSBVGA=m
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=m
Modified: dists/trunk/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.versatile Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/armel/config.versatile Sun Dec 6 19:57:07 2009 (r14745)
@@ -354,10 +354,6 @@
# CONFIG_USB_R8A66597_HCD is not set
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_VIDEO_OUTPUT_CONTROL=m
Modified: dists/trunk/linux-2.6/debian/config/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/m68k/config Sun Dec 6 19:57:07 2009 (r14745)
@@ -86,11 +86,6 @@
# CONFIG_ISDN is not set
##
-## file: drivers/md/Kconfig
-##
-CONFIG_MD=y
-
-##
## file: drivers/media/Kconfig
##
# CONFIG_VIDEO_DEV is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Sun Dec 6 19:57:07 2009 (r14745)
@@ -537,26 +537,6 @@
# CONFIG_NEW_LEDS is not set
##
-## file: drivers/md/Kconfig
-##
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-
-##
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
@@ -1230,10 +1210,6 @@
CONFIG_USB_MON=y
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Sun Dec 6 19:57:07 2009 (r14745)
@@ -594,27 +594,6 @@
# CONFIG_NEW_LEDS is not set
##
-## file: drivers/md/Kconfig
-##
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_DELAY=m
-
-##
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
@@ -1495,10 +1474,6 @@
CONFIG_USB_SERIAL_DEBUG=m
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Sun Dec 6 19:57:07 2009 (r14745)
@@ -542,10 +542,6 @@
CONFIG_USB_UHCI_HCD=m
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Sun Dec 6 19:57:07 2009 (r14745)
@@ -339,24 +339,6 @@
# CONFIG_ISDN is not set
##
-## file: drivers/md/Kconfig
-##
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-
-##
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
@@ -697,10 +679,6 @@
CONFIG_USB_MON=y
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Sun Dec 6 19:57:07 2009 (r14745)
@@ -369,24 +369,6 @@
# CONFIG_ISDN is not set
##
-## file: drivers/md/Kconfig
-##
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-
-##
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
@@ -727,10 +709,6 @@
CONFIG_USB_MON=y
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Sun Dec 6 19:48:16 2009 (r14744)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Sun Dec 6 19:57:07 2009 (r14745)
@@ -700,10 +700,6 @@
CONFIG_USB_MON=y
##
-## file: drivers/usb/storage/Kconfig
-##
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=m
@@ -720,10 +716,6 @@
# CONFIG_W1 is not set
##
-## file: drivers/watchdog/Kconfig
-##
-
-##
## file: fs/cramfs/Kconfig
##
CONFIG_CRAMFS=y
More information about the Kernel-svn-changes
mailing list