[kernel] r17327 - in dists/trunk/linux-2.6/debian/config: . alpha armel armhf hppa i386/none ia64 kernelarch-x86 m68k mips mipsel powerpc s390 sh4 sparc
Maximilian Attems
maks at alioth.debian.org
Mon May 9 12:25:34 UTC 2011
Author: maks
Date: Mon May 9 12:25:32 2011
New Revision: 17327
Log:
update config to 2.6.39-rc6
Modified:
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/armel/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/armhf/config
dists/trunk/linux-2.6/debian/config/armhf/config.mx5
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/hppa/config
dists/trunk/linux-2.6/debian/config/i386/none/config.486
dists/trunk/linux-2.6/debian/config/i386/none/config.686-pae
dists/trunk/linux-2.6/debian/config/ia64/config
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
dists/trunk/linux-2.6/debian/config/m68k/config
dists/trunk/linux-2.6/debian/config/m68k/config.amiga
dists/trunk/linux-2.6/debian/config/m68k/config.atari
dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000
dists/trunk/linux-2.6/debian/config/m68k/config.mac
dists/trunk/linux-2.6/debian/config/m68k/config.mvme147
dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x
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.octeon
dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
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.loongson-2f
dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc
dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64
dists/trunk/linux-2.6/debian/config/s390/config
dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r
dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr
dists/trunk/linux-2.6/debian/config/sparc/config
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Mon May 9 12:25:32 2011 (r17327)
@@ -153,24 +153,7 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_DIGIEPCA is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_ISI=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_N_HDLC=m
-CONFIG_SPECIALIX=m
-CONFIG_SX=m
-# CONFIG_RIO is not set
CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -461,7 +444,6 @@
CONFIG_RADIO_RTRACK2=m
CONFIG_RADIO_AZTECH=m
CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_MAESTRO=m
CONFIG_RADIO_SF16FMI=m
@@ -497,7 +479,6 @@
##
CONFIG_MTD=m
# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_CONCAT=m
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
@@ -857,7 +838,43 @@
CONFIG_PCMCIA_SYM53C500=m
##
-## file: drivers/serial/Kconfig
+## file: drivers/staging/generic_serial/Kconfig
+##
+CONFIG_SX=m
+# CONFIG_RIO is not set
+
+##
+## file: drivers/staging/tty/Kconfig
+##
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+# CONFIG_DIGIEPCA is not set
+CONFIG_SPECIALIX=m
+
+##
+## file: drivers/telephony/Kconfig
+##
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
@@ -872,13 +889,6 @@
CONFIG_SERIAL_JSM=m
##
-## file: drivers/telephony/Kconfig
-##
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-
-##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
@@ -1178,3 +1188,9 @@
##
CONFIG_SND_HDA_INTEL=m
+##
+## file: unknown
+##
+CONFIG_MTD_CONCAT=m
+CONFIG_RADIO_GEMTEK_PCI=m
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/armel/config Mon May 9 12:25:32 2011 (r17327)
@@ -12,7 +12,7 @@
CONFIG_EARLY_PRINTK=y
##
-## file: "arch/arm/mm/Kconfig"
+## file: arch/arm/mm/Kconfig
##
#. Support Thumb user binaries
CONFIG_ARM_THUMB=y
@@ -98,3 +98,4 @@
# CONFIG_KERNEL_BZIP2 is not set
CONFIG_KERNEL_LZMA=y
## end choice
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x Mon May 9 12:25:32 2011 (r17327)
@@ -2,7 +2,6 @@
## file: arch/arm/Kconfig
##
## choice: ARM system type
-# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_REALVIEW is not set
# CONFIG_ARCH_VERSATILE is not set
@@ -24,7 +23,6 @@
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_S3C2410 is not set
# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
## end choice
CONFIG_PCI=y
@@ -113,9 +111,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_NVRAM is not set
# CONFIG_DTLK is not set
# CONFIG_APPLICOM is not set
@@ -313,7 +308,6 @@
##
## file: drivers/media/radio/Kconfig
##
-# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
@@ -342,7 +336,6 @@
##
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
@@ -509,7 +502,20 @@
# CONFIG_SCSI_ACARD is not set
##
-## file: drivers/serial/Kconfig
+## file: drivers/spi/Kconfig
+##
+CONFIG_SPI=y
+# CONFIG_SPI_BITBANG is not set
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
@@ -519,12 +525,6 @@
# CONFIG_SERIAL_JSM is not set
##
-## file: drivers/spi/Kconfig
-##
-CONFIG_SPI=y
-# CONFIG_SPI_BITBANG is not set
-
-##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
@@ -603,11 +603,6 @@
CONFIG_LOG_BUF_SHIFT=14
##
-## file: kernel/power/Kconfig
-##
-# CONFIG_PM is not set
-
-##
## file: kernel/Kconfig.preempt
##
## choice: Preemption Model
@@ -740,3 +735,11 @@
##
# CONFIG_SND_HDA_INTEL is not set
+##
+## file: unknown
+##
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_MTD_CONCAT=y
+# CONFIG_RADIO_GEMTEK_PCI is not set
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Mon May 9 12:25:32 2011 (r17327)
@@ -2,7 +2,6 @@
## file: arch/arm/Kconfig
##
## choice: ARM system type
-# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_REALVIEW is not set
# CONFIG_ARCH_VERSATILE is not set
@@ -24,7 +23,6 @@
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_S3C2410 is not set
# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
## end choice
CONFIG_PCI=y
@@ -148,9 +146,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_NVRAM is not set
# CONFIG_DTLK is not set
# CONFIG_APPLICOM is not set
@@ -320,7 +315,6 @@
##
## file: drivers/media/radio/Kconfig
##
-# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_USB_DSBR is not set
@@ -340,7 +334,6 @@
##
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
@@ -593,7 +586,20 @@
# CONFIG_SCSI_QLA_ISCSI is not set
##
-## file: drivers/serial/Kconfig
+## file: drivers/spi/Kconfig
+##
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=m
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
@@ -603,12 +609,6 @@
# CONFIG_SERIAL_JSM is not set
##
-## file: drivers/spi/Kconfig
-##
-CONFIG_SPI=y
-CONFIG_SPI_BITBANG=m
-
-##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
@@ -684,11 +684,6 @@
CONFIG_LOG_BUF_SHIFT=14
##
-## file: kernel/power/Kconfig
-##
-# CONFIG_PM is not set
-
-##
## file: kernel/Kconfig.preempt
##
## choice: Preemption Model
@@ -819,3 +814,11 @@
##
# CONFIG_SND_HDA_INTEL is not set
+##
+## file: unknown
+##
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_MTD_CONCAT=y
+# CONFIG_RADIO_GEMTEK_PCI is not set
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Mon May 9 12:25:32 2011 (r17327)
@@ -2,7 +2,6 @@
## file: arch/arm/Kconfig
##
## choice: ARM system type
-# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_REALVIEW is not set
# CONFIG_ARCH_VERSATILE is not set
@@ -30,7 +29,6 @@
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_S3C2410 is not set
# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
## end choice
@@ -277,7 +275,6 @@
##
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_CMDLINE_PARTS=y
@@ -485,16 +482,6 @@
# CONFIG_SCSI_QLA_ISCSI is not set
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI_ORION=y
@@ -505,14 +492,19 @@
# CONFIG_SSB is not set
##
-## file: drivers/staging/udlfb/Kconfig
+## file: drivers/staging/xgifb/Kconfig
##
-CONFIG_FB_UDL=m
+CONFIG_FB_XGI=m
##
-## file: drivers/staging/xgifb/Kconfig
+## file: drivers/tty/serial/Kconfig
##
-CONFIG_FB_XGI=m
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
##
## file: drivers/usb/Kconfig
@@ -541,6 +533,7 @@
## file: drivers/video/Kconfig
##
CONFIG_FB=m
+CONFIG_FB_UDL=m
##
## file: drivers/video/console/Kconfig
@@ -596,7 +589,6 @@
##
## file: kernel/power/Kconfig
##
-CONFIG_PM=y
# CONFIG_SUSPEND is not set
##
@@ -643,3 +635,10 @@
CONFIG_SND_KIRKWOOD_SOC=m
CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
+##
+## file: unknown
+##
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_MTD_CONCAT is not set
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x Mon May 9 12:25:32 2011 (r17327)
@@ -2,7 +2,6 @@
## file: arch/arm/Kconfig
##
## choice: ARM system type
-# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_REALVIEW is not set
# CONFIG_ARCH_VERSATILE is not set
@@ -29,7 +28,6 @@
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_S3C2410 is not set
# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
## end choice
@@ -273,7 +271,6 @@
##
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_CMDLINE_PARTS=y
@@ -481,7 +478,12 @@
# CONFIG_SCSI_QLA_ISCSI is not set
##
-## file: drivers/serial/Kconfig
+## file: drivers/ssb/Kconfig
+##
+# CONFIG_SSB is not set
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
@@ -491,11 +493,6 @@
# CONFIG_SERIAL_8250_EXTENDED is not set
##
-## file: drivers/ssb/Kconfig
-##
-# CONFIG_SSB is not set
-
-##
## file: drivers/usb/Kconfig
##
CONFIG_USB_SUPPORT=y
@@ -564,11 +561,6 @@
CONFIG_EFI_PARTITION=y
##
-## file: kernel/power/Kconfig
-##
-# CONFIG_PM is not set
-
-##
## file: mm/Kconfig
##
## choice: Memory model
@@ -596,3 +588,10 @@
##
CONFIG_WAN_ROUTER=m
+##
+## file: unknown
+##
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_MTD_CONCAT is not set
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.versatile Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/armel/config.versatile Mon May 9 12:25:32 2011 (r17327)
@@ -2,7 +2,6 @@
## file: arch/arm/Kconfig
##
## choice: ARM system type
-# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_REALVIEW is not set
CONFIG_ARCH_VERSATILE=y
@@ -28,7 +27,6 @@
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_S3C2410 is not set
# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
## end choice
@@ -145,9 +143,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_NVRAM is not set
# CONFIG_APPLICOM is not set
@@ -283,7 +278,19 @@
CONFIG_SCSI_SYM53C8XX_2=m
##
-## file: drivers/serial/Kconfig
+## file: drivers/spi/Kconfig
+##
+# CONFIG_SPI is not set
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/serial/Kconfig
##
# CONFIG_SERIAL_8250 is not set
CONFIG_SERIAL_AMBA_PL011=y
@@ -291,11 +298,6 @@
# CONFIG_SERIAL_JSM is not set
##
-## file: drivers/spi/Kconfig
-##
-# CONFIG_SPI is not set
-
-##
## file: drivers/usb/Kconfig
##
CONFIG_USB_SUPPORT=y
@@ -387,11 +389,6 @@
CONFIG_LOGO_LINUX_CLUT224=y
##
-## file: kernel/power/Kconfig
-##
-# CONFIG_PM is not set
-
-##
## file: kernel/Kconfig.preempt
##
## choice: Preemption Model
@@ -450,3 +447,9 @@
##
# CONFIG_WAN_ROUTER is not set
+##
+## file: unknown
+##
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_LH7A40X is not set
+
Modified: dists/trunk/linux-2.6/debian/config/armhf/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/armhf/config Mon May 9 12:25:32 2011 (r17327)
@@ -5,7 +5,6 @@
CONFIG_ATAGS_PROC=y
#. Enable floating point unit
CONFIG_VFP=y
-CONFIG_VFPv3=y
##
## file: drivers/input/mouse/Kconfig
@@ -32,3 +31,4 @@
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
## end choice
+
Modified: dists/trunk/linux-2.6/debian/config/armhf/config.mx5
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config.mx5 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.mx5 Mon May 9 12:25:32 2011 (r17327)
@@ -4,33 +4,31 @@
## choice: ARM system type
CONFIG_ARCH_MXC=y
## end choice
-#. Enable NEON SIMD support
-CONFIG_NEON=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
+#. cpufreq driver for i.MX CPU
+CONFIG_CPU_FREQ_IMX=m
+#. Enable NEON SIMD support
+CONFIG_NEON=y
+
+##
+## file: arch/arm/mach-mx5/Kconfig
+##
+CONFIG_MACH_MX51_EFIKAMX=y
##
## file: arch/arm/plat-mxc/Kconfig
##
+## choice: Freescale CPU family:
#. enable MX5, otherwise it defaults to MX3 and ignores MACH_MX51_EFIKAMX
CONFIG_ARCH_MX5=y
+## end choice
#. Enable PWM driver
CONFIG_MXC_PWM=y
##
-## file: arch/arm/mach-mx5/Kconfig
-##
-CONFIG_MACH_MX51_EFIKAMX=y
-
-##
-## file: drivers/cpufreq/Kconfig
-##
-#. cpufreq driver for i.MX CPU
-CONFIG_CPU_FREQ_IMX=m
-
-##
## file: drivers/dma/Kconfig
-##
+##
CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
@@ -40,51 +38,58 @@
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
-##
-## file: drivers/hid/Kconfig
+##
+## file: drivers/hid/usbhid/Kconfig
##
CONFIG_USB_HID=y
-##
-## file: drivers/i2c/Kconfig
-##
+##
+## file: drivers/i2c/busses/Kconfig
+##
CONFIG_I2C_IMX=y
-##
+##
## file: drivers/leds/Kconfig
-##
+##
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_GPIO_PLATFORM=y
CONFIG_LEDS_TRIGGER_GPIO=y
-##
+##
## file: drivers/mfd/Kconfig
-##
+##
CONFIG_MFD_MC13XXX=y
-##
+##
## file: drivers/mmc/Kconfig
-##
+##
CONFIG_MMC=m
+
+##
+## file: drivers/mmc/card/Kconfig
+##
CONFIG_MMC_BLOCK=y
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+
+##
+## file: drivers/mmc/host/Kconfig
+##
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_MMC_MXC=y
-##
+##
## file: drivers/mtd/Kconfig
-##
+##
#. Efika has SPI NOR MTD device
CONFIG_MTD=m
-##
+##
## file: drivers/power/Kconfig
-##
+##
CONFIG_POWER_SUPPLY=y
-##
+##
## file: drivers/regulator/Kconfig
-##
+##
#. Provide dummy if lookup fails
CONFIG_REGULATOR_DUMMY=y
#. It is not set at top level
@@ -93,57 +98,57 @@
CONFIG_REGULATOR_USERSPACE_CONSUMER=y
CONFIG_REGULATOR_MC13892=y
-##
+##
## file: drivers/rtc/Kconfig
-##
-CONFIG_RTC_LIB=y
+##
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_MC13XXX=y
-##
+##
## file: drivers/spi/Kconfig
-##
-CONFIG_SPI_MASTER=y
+##
CONFIG_SPI_GPIO=y
-CONFIG_SPI_IMX_VER_0_7=y
-CONFIG_SPI_IMX_VER_2_3=y
CONFIG_SPI_IMX=y
##
-## file: drivers/ssb/Kconfig
-##
-CONFIG_SSB_POSSIBLE=y
-
-##
## file: drivers/tty/serial/Kconfig
-##
+##
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
##
## file: drivers/usb/Kconfig
-##
+##
CONFIG_USB=y
+
+##
+## file: drivers/usb/host/Kconfig
+##
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
+
+##
+## file: drivers/usb/otg/Kconfig
+##
CONFIG_USB_ULPI=y
-##
+##
## file: drivers/watchdog/Kconfig
-##
+##
CONFIG_IMX2_WDT=y
-##
-## file: sound/Kconfig
-##
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_JACK=y
+##
+## file: sound/soc/Kconfig
+##
CONFIG_SND_SOC=m
-CONFIG_SND_SOC_AC97_BUS=y
+
+##
+## file: sound/soc/imx/Kconfig
+##
CONFIG_SND_IMX_SOC=m
-CONFIG_SND_MXC_SOC_MX2=m
+
+##
+## file: unknown
+##
CONFIG_SND_SOC_IMX_SGTL5000=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-CONFIG_SND_SOC_SGTL5000=m
-CONFIG_AC97_BUS=m
+
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/config Mon May 9 12:25:32 2011 (r17327)
@@ -226,19 +226,7 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_DEVKMEM is not set
-CONFIG_COMPUTONE=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_N_GSM=m
-CONFIG_RISCOM8=m
-# CONFIG_STALLION is not set
-# CONFIG_ISTALLION is not set
-CONFIG_NOZOMI=m
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
CONFIG_VIRTIO_CONSOLE=m
# CONFIG_R3964 is not set
CONFIG_PC8736x_GPIO=m
@@ -387,7 +375,6 @@
CONFIG_HID_PRODIKEYS=m
CONFIG_HID_DRAGONRISE=m
CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EGALAX=m
CONFIG_HID_ELECOM=m
CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m
@@ -488,11 +475,9 @@
CONFIG_SENSORS_W83627EHF=m
CONFIG_SENSORS_WM831X=m
CONFIG_SENSORS_WM8350=m
-CONFIG_SENSORS_LIS3_I2C=m
CONFIG_SENSORS_APPLESMC=m
CONFIG_SENSORS_MC13783_ADC=m
CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
##
## file: drivers/i2c/Kconfig
@@ -686,7 +671,6 @@
CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
-CONFIG_INPUT_WINBOND_CIR=m
CONFIG_INPUT_PCF50633_PMU=m
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
CONFIG_INPUT_WM831X_ON=m
@@ -855,32 +839,6 @@
##
CONFIG_MEDIA_SUPPORT=m
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
-
-##
-## file: drivers/media/rc/Kconfig
-##
-CONFIG_RC_CORE=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-# CONFIG_IR_NUVOTON is not set
-CONFIG_IR_STREAMZAP=m
-
-##
-## file: drivers/media/rc/keymaps/Kconfig
-##
-CONFIG_RC_MAP=m
##
## file: drivers/media/common/tuners/Kconfig
@@ -1076,6 +1034,28 @@
CONFIG_I2C_SI470X=y
##
+## file: drivers/media/rc/Kconfig
+##
+CONFIG_RC_CORE=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+# CONFIG_IR_NUVOTON is not set
+CONFIG_IR_STREAMZAP=m
+
+##
+## file: drivers/media/rc/keymaps/Kconfig
+##
+CONFIG_RC_MAP=m
+
+##
## file: drivers/media/video/Kconfig
##
CONFIG_VIDEO_CAPTURE_DRIVERS=y
@@ -1085,7 +1065,6 @@
CONFIG_VIDEO_TVAUDIO=m
CONFIG_VIDEO_TDA7432=m
CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
CONFIG_VIDEO_TEA6415C=m
CONFIG_VIDEO_TEA6420=m
CONFIG_VIDEO_MSP3400=m
@@ -1132,7 +1111,6 @@
CONFIG_SOC_CAMERA_OV9640=m
CONFIG_VIDEO_SH_MOBILE_CEU=m
CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_SE401=m
CONFIG_USB_ZR364XX=m
CONFIG_USB_STKWEBCAM=m
CONFIG_USB_S2255=m
@@ -1306,13 +1284,6 @@
CONFIG_VIDEO_TLG2300=m
##
-## file: drivers/media/video/usbvideo/Kconfig
-##
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-
-##
## file: drivers/media/video/usbvision/Kconfig
##
CONFIG_VIDEO_USBVISION=m
@@ -1450,6 +1421,11 @@
# CONFIG_IWMC3200TOP_DEBUGFS is not set
##
+## file: drivers/misc/lis3lv02d/Kconfig
+##
+CONFIG_SENSORS_LIS3_I2C=m
+
+##
## file: drivers/mmc/card/Kconfig
##
CONFIG_MMC_BLOCK_MINORS=8
@@ -1541,10 +1517,6 @@
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
-
-##
-## file: drivers/mtd/ubi/Kconfig.debug
-##
# CONFIG_MTD_UBI_DEBUG is not set
##
@@ -1591,7 +1563,6 @@
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
CONFIG_SIS190=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
@@ -1930,7 +1901,6 @@
##
## file: drivers/net/wireless/iwlegacy/Kconfig
##
-CONFIG_IWLWIFI_LEGACY=m
# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
CONFIG_IWL4965=m
@@ -1986,12 +1956,10 @@
CONFIG_RT2500PCI=m
CONFIG_RT61PCI=m
CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT30XX=y
# CONFIG_RT2800PCI_RT35XX is not set
CONFIG_RT2500USB=m
CONFIG_RT73USB=m
CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT30XX=y
# CONFIG_RT2800USB_RT35XX is not set
# CONFIG_RT2800USB_UNKNOWN is not set
# CONFIG_RT2X00_DEBUG is not set
@@ -2006,7 +1974,6 @@
## file: drivers/net/wireless/rtlwifi/Kconfig
##
CONFIG_RTL8192CE=m
-CONFIG_RTLWIFI=m
##
## file: drivers/net/wireless/wl1251/Kconfig
@@ -2019,9 +1986,6 @@
## file: drivers/net/wireless/wl12xx/Kconfig
##
CONFIG_WL12XX=m
-CONFIG_WL1271=m
-CONFIG_WL1271_SPI=m
-CONFIG_WL1271_SDIO=m
##
## file: drivers/net/wireless/zd1211rw/Kconfig
@@ -2095,6 +2059,7 @@
CONFIG_COMPAL_LAPTOP=m
CONFIG_SONY_LAPTOP=m
# CONFIG_RAR_REGISTER is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
##
## file: drivers/pnp/Kconfig
@@ -2323,7 +2288,6 @@
CONFIG_SCSI_SAS_LIBSAS=m
CONFIG_SCSI_SAS_ATA=y
CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
##
## file: drivers/scsi/megaraid/Kconfig.megaraid
@@ -2367,22 +2331,6 @@
CONFIG_SCSI_QLA_ISCSI=m
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_FOURPORT=m
-CONFIG_SERIAL_8250_ACCENT=m
-CONFIG_SERIAL_8250_BOCA=m
-CONFIG_SERIAL_8250_HUB6=m
-CONFIG_SERIAL_8250_MCA=m
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MFD_HSU=m
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
@@ -2415,23 +2363,11 @@
# CONFIG_ASUS_OLED is not set
##
-## file: drivers/staging/autofs/Kconfig
-##
-CONFIG_AUTOFS_FS=m
-
-##
## file: drivers/staging/comedi/Kconfig
##
# CONFIG_COMEDI is not set
##
-## file: drivers/staging/cpia/Kconfig
-##
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-
-##
## file: drivers/staging/crystalhd/Kconfig
##
# CONFIG_CRYSTALHD is not set
@@ -2512,11 +2448,6 @@
# CONFIG_RTL8192E is not set
##
-## file: drivers/staging/samsung-laptop/Kconfig
-##
-# CONFIG_SAMSUNG_LAPTOP is not set
-
-##
## file: drivers/staging/serqt_usb2/Kconfig
##
# CONFIG_USB_SERIAL_QUATECH2 is not set
@@ -2532,11 +2463,6 @@
# CONFIG_FB_SM7XX is not set
##
-## file: drivers/staging/smbfs/Kconfig
-##
-# CONFIG_SMB_FS is not set
-
-##
## file: drivers/staging/speakup/Kconfig
##
CONFIG_SPEAKUP=m
@@ -2556,14 +2482,12 @@
CONFIG_SPEAKUP_SYNTH_DUMMY=m
##
-## file: drivers/staging/stradis/Kconfig
-##
-CONFIG_VIDEO_STRADIS=m
-
+## file: drivers/staging/tty/Kconfig
##
-## file: drivers/staging/udlfb/Kconfig
-##
-# CONFIG_FB_UDL is not set
+# CONFIG_STALLION is not set
+# CONFIG_ISTALLION is not set
+CONFIG_RISCOM8=m
+CONFIG_COMPUTONE=m
##
## file: drivers/staging/usbip/Kconfig
@@ -2604,6 +2528,34 @@
CONFIG_TCM_PSCSI=m
##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_N_GSM=m
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_FOURPORT=m
+CONFIG_SERIAL_8250_ACCENT=m
+CONFIG_SERIAL_8250_BOCA=m
+CONFIG_SERIAL_8250_HUB6=m
+CONFIG_SERIAL_8250_MCA=m
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MFD_HSU=m
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+
+##
## file: drivers/uio/Kconfig
##
CONFIG_UIO=m
@@ -2827,6 +2779,7 @@
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_TMIO is not set
CONFIG_FB_SM501=m
+# CONFIG_FB_UDL is not set
CONFIG_FB_METRONOME=m
CONFIG_FB_MB862XX=m
CONFIG_FB_MB862XX_PCI_GDC=y
@@ -2839,7 +2792,6 @@
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
# CONFIG_BACKLIGHT_SAHARA is not set
CONFIG_BACKLIGHT_WM831X=m
@@ -2940,25 +2892,6 @@
CONFIG_AFS_FSCACHE=y
##
-## file: fs/aufs/Kconfig
-##
-CONFIG_AUFS_FS=m
-## choice: Maximum number of branches
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-## end choice
-# CONFIG_AUFS_HNOTIFY is not set
-# CONFIG_AUFS_EXPORT is not set
-# CONFIG_AUFS_RDU is not set
-# CONFIG_AUFS_SP_IATTR is not set
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_BR_FUSE is not set
-# CONFIG_AUFS_DEBUG is not set
-
-##
## file: fs/autofs4/Kconfig
##
CONFIG_AUTOFS4_FS=m
@@ -3416,7 +3349,6 @@
## file: init/Kconfig
##
CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCK_KERNEL is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
## choice: Kernel compression mode
@@ -3471,7 +3403,6 @@
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_EMBEDDED is not set
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
@@ -3485,6 +3416,7 @@
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
+# CONFIG_EMBEDDED is not set
CONFIG_PERF_EVENTS=y
#. Compatibility setting
# CONFIG_PERF_COUNTERS is not set
@@ -3522,14 +3454,13 @@
##
## file: kernel/power/Kconfig
##
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_VERBOSE is not set
CONFIG_SUSPEND=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_RUNTIME=y
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_VERBOSE is not set
+CONFIG_PM_ADVANCED_DEBUG=y
##
## file: kernel/Kconfig.preempt
@@ -3602,7 +3533,6 @@
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_BKL is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_PROVE_LOCKING is not set
# CONFIG_SPARSE_RCU_POINTER is not set
@@ -3815,10 +3745,6 @@
##
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
-## choice: Choose IP: FIB lookup algorithm (choose FIB_HASH if unsure)
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-## end choice
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_MULTIPATH=y
CONFIG_IP_ROUTE_VERBOSE=y
@@ -3871,7 +3797,6 @@
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_TTL=m
@@ -4095,7 +4020,6 @@
## file: net/phonet/Kconfig
##
CONFIG_PHONET=m
-# CONFIG_PHONET_PIPECTRLR is not set
##
## file: net/rds/Kconfig
@@ -4191,9 +4115,6 @@
##
CONFIG_TIPC=m
CONFIG_TIPC_ADVANCED=y
-CONFIG_TIPC_ZONES=3
-CONFIG_TIPC_CLUSTERS=1
-CONFIG_TIPC_NODES=255
CONFIG_TIPC_PORTS=8191
CONFIG_TIPC_LOG=0
# CONFIG_TIPC_DEBUG is not set
@@ -4352,7 +4273,6 @@
CONFIG_SND_INDIGODJX=m
CONFIG_SND_ES1968_INPUT=y
CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
CONFIG_SND_LX6464ES=m
CONFIG_SND_MAESTRO3_INPUT=y
CONFIG_SND_PCXHR=m
@@ -4424,6 +4344,7 @@
# CONFIG_ANDROID_LOGGER is not set
# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
# CONFIG_ANDROID_RAM_CONSOLE is not set
+CONFIG_ASK_IP_FIB_HASH=y
# CONFIG_ATH9K_DEBUG is not set
# CONFIG_AUFS_BRANCH_MAX_1023 is not set
CONFIG_AUFS_BRANCH_MAX_127=y
@@ -4435,51 +4356,86 @@
# CONFIG_AUFS_EXPORT is not set
CONFIG_AUFS_FS=m
# CONFIG_AUFS_HINOTIFY is not set
+# CONFIG_AUFS_HNOTIFY is not set
# CONFIG_AUFS_RDU is not set
# CONFIG_AUFS_SHWH is not set
# CONFIG_AUFS_SP_IATTR is not set
+CONFIG_AUTOFS_FS=m
# CONFIG_B3DFG is not set
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+# CONFIG_BKL is not set
CONFIG_BT_L2CAP_EXT_FEATURES=y
+CONFIG_DAB=y
# CONFIG_DEBUG_CFQ_IOSCHED is not set
# CONFIG_DEFAULT_AS is not set
# CONFIG_DST is not set
# CONFIG_DT3155 is not set
CONFIG_DVB_LGDT3304=m
# CONFIG_FORCEDETH_NAPI is not set
+CONFIG_HID_EGALAX=m
# CONFIG_HW_BRANCH_TRACER is not set
CONFIG_INOTIFY=y
# CONFIG_INPUT_GPIO is not set
# CONFIG_INPUT_MIMIO is not set
+CONFIG_INPUT_WINBOND_CIR=m
CONFIG_IP_DCCP_CCID3_RTO=100
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
CONFIG_IWLWIFI_LEDS=y
CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
# CONFIG_KMEMTRACE is not set
CONFIG_LBD=y
+# CONFIG_LOCK_KERNEL is not set
# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
CONFIG_MAGIC_SYSRQ_DEFAULT_MASK=0x01b6
# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
# CONFIG_OTUS is not set
CONFIG_PCI_LEGACY=y
# CONFIG_PCMCIA_IOCTL is not set
+# CONFIG_PHONET_PIPECTRLR is not set
# CONFIG_PLAN9AUTH is not set
# CONFIG_POCH is not set
# CONFIG_POWER_TRACER is not set
CONFIG_QT2160=m
+CONFIG_R8169_VLAN=y
CONFIG_RPCSEC_GSS_SPKM3=m
+CONFIG_RT2800PCI_RT30XX=y
+CONFIG_RT2800USB_RT30XX=y
# CONFIG_RTL8187SE is not set
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
CONFIG_SECURITY_FILE_CAPABILITIES=y
# CONFIG_SECURITY_ROOTPLUG is not set
CONFIG_SENSORS_ADT7473=m
# CONFIG_SLOW_WORK_DEBUG is not set
+# CONFIG_SMB_FS is not set
+CONFIG_SND_HIFIER=m
# CONFIG_SYSPROF_TRACER is not set
+CONFIG_TIPC_CLUSTERS=1
+CONFIG_TIPC_NODES=255
CONFIG_TIPC_SLAVE_NODES=0
+CONFIG_TIPC_ZONES=3
+CONFIG_USB_DABUSB=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
# CONFIG_USB_OV511 is not set
# CONFIG_USB_QUICKCAM_MESSENGER is not set
+CONFIG_USB_SE401=m
+CONFIG_USB_VICAM=m
CONFIG_UWB_I1480U_WLP=m
CONFIG_UWB_WLP=m
+CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
CONFIG_VIDEO_SAA5246A=m
CONFIG_VIDEO_SAA5249=m
+CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_TDA9875=m
+CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_WIRELESS_OLD_REGULATORY=y
+CONFIG_WL1271=m
+CONFIG_WL1271_SDIO=m
+CONFIG_WL1271_SPI=m
# CONFIG_WORKQUEUE_TRACER is not set
Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/hppa/config Mon May 9 12:25:32 2011 (r17327)
@@ -42,9 +42,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
@@ -463,7 +460,19 @@
CONFIG_PCMCIA_SYM53C500=m
##
-## file: drivers/serial/Kconfig
+## file: drivers/telephony/Kconfig
+##
+# CONFIG_PHONE is not set
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
@@ -480,11 +489,6 @@
CONFIG_SERIAL_JSM=m
##
-## file: drivers/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.486
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.486 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.486 Mon May 9 12:25:32 2011 (r17327)
@@ -20,16 +20,6 @@
## end choice
##
-## file: drivers/char/Kconfig
-##
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_RIO=m
-CONFIG_RIO_OLDPCI=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
-
-##
## file: drivers/eisa/Kconfig
##
CONFIG_EISA_VLB_PRIMING=y
@@ -84,15 +74,15 @@
CONFIG_MADGEMC=m
##
-## file: drivers/platform/x86/Kconfig
+## file: drivers/pci/hotplug/Kconfig
##
-CONFIG_XO1_RFKILL=m
-CONFIG_XO15_EBOOK=m
+CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
##
-## file: drivers/pci/hotplug/Kconfig
+## file: drivers/platform/x86/Kconfig
##
-CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
+CONFIG_XO1_RFKILL=m
+CONFIG_XO15_EBOOK=m
##
## file: drivers/power/Kconfig
@@ -114,6 +104,24 @@
CONFIG_SCSI_SIM710=m
##
+## file: drivers/staging/generic_serial/Kconfig
+##
+CONFIG_RIO=m
+CONFIG_RIO_OLDPCI=y
+
+##
+## file: drivers/staging/tty/Kconfig
+##
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_DIGIEPCA=m
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_MOXA_INTELLIO=m
+
+##
## file: drivers/video/geode/Kconfig
##
CONFIG_FB_GEODE_LX=y
@@ -121,4 +129,5 @@
##
## file: mm/Kconfig
##
-CONFIG_TRANSPARENT_HUGEPAGE=n
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+
Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.686-pae
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.686-pae Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686-pae Mon May 9 12:25:32 2011 (r17327)
@@ -20,14 +20,6 @@
## end choice
##
-## file: drivers/char/Kconfig
-##
-# CONFIG_DIGIEPCA is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_SX is not set
-# CONFIG_RIO is not set
-
-##
## file: drivers/i2c/busses/Kconfig
##
# CONFIG_I2C_ELEKTOR is not set
@@ -49,6 +41,22 @@
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
##
+## file: drivers/staging/generic_serial/Kconfig
+##
+# CONFIG_SX is not set
+# CONFIG_RIO is not set
+
+##
+## file: drivers/staging/tty/Kconfig
+##
+# CONFIG_DIGIEPCA is not set
+
+##
+## file: drivers/tty/Kconfig
+##
+# CONFIG_MOXA_INTELLIO is not set
+
+##
## file: lib/Kconfig.debug
##
# CONFIG_DEBUG_HIGHMEM is not set
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Mon May 9 12:25:32 2011 (r17327)
@@ -87,21 +87,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-# CONFIG_CYCLADES is not set
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_ISI is not set
-CONFIG_SYNCLINKMP=m
-CONFIG_N_HDLC=m
-CONFIG_SPECIALIX=m
-CONFIG_SX=m
-CONFIG_RIO=m
-CONFIG_RIO_OLDPCI=y
CONFIG_STALDRV=y
CONFIG_SGI_SNSC=y
CONFIG_SGI_TIOCX=y
@@ -378,7 +363,6 @@
##
## file: drivers/media/radio/Kconfig
##
-CONFIG_RADIO_GEMTEK_PCI=m
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_MAESTRO=m
CONFIG_USB_DSBR=m
@@ -586,26 +570,22 @@
CONFIG_PCMCIA_SYM53C500=m
##
-## file: drivers/serial/Kconfig
+## file: drivers/sn/Kconfig
##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_SGI_L1_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SGI_IOC4=m
-CONFIG_SERIAL_SGI_IOC3=m
+CONFIG_SGI_IOC3=m
##
-## file: drivers/sn/Kconfig
+## file: drivers/staging/generic_serial/Kconfig
##
-CONFIG_SGI_IOC3=m
+CONFIG_SX=m
+CONFIG_RIO=m
+CONFIG_RIO_OLDPCI=y
+
+##
+## file: drivers/staging/tty/Kconfig
+##
+CONFIG_DIGIEPCA=m
+CONFIG_SPECIALIX=m
##
## file: drivers/staging/wlan-ng/Kconfig
@@ -620,6 +600,37 @@
CONFIG_PHONE_IXJ_PCMCIA=m
##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+# CONFIG_CYCLADES is not set
+CONFIG_MOXA_INTELLIO=m
+# CONFIG_MOXA_SMARTIO is not set
+CONFIG_SYNCLINKMP=m
+# CONFIG_ISI is not set
+CONFIG_N_HDLC=m
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_SGI_L1_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SGI_IOC4=m
+CONFIG_SERIAL_SGI_IOC3=m
+
+##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
@@ -817,4 +828,5 @@
## file: unknown
##
CONFIG_IA32_SUPPORT=y
+CONFIG_RADIO_GEMTEK_PCI=m
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Mon May 9 12:25:32 2011 (r17327)
@@ -132,8 +132,8 @@
CONFIG_ACPI_FAN=m
CONFIG_ACPI_DOCK=y
CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=m
@@ -266,21 +266,10 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_N_HDLC=m
-CONFIG_SX=m
CONFIG_STALDRV=y
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
-CONFIG_HVC_XEN=y
CONFIG_NVRAM=m
CONFIG_DTLK=m
CONFIG_R3964=m
@@ -394,10 +383,7 @@
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
# CONFIG_DRM_I810 is not set
-## choice: Intel 830M, 845G, 852GM, 855GM, 865G
-# CONFIG_DRM_I830 is not set
CONFIG_DRM_I915=m
-## end choice
CONFIG_DRM_I915_KMS=y
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
@@ -539,11 +525,6 @@
# CONFIG_INTEL_IDLE is not set
##
-## file: drivers/input/Kconfig
-##
-CONFIG_XEN_KBDDEV_FRONTEND=y
-
-##
## file: drivers/input/gameport/Kconfig
##
CONFIG_GAMEPORT=m
@@ -663,7 +644,6 @@
##
## file: drivers/media/radio/Kconfig
##
-CONFIG_RADIO_GEMTEK_PCI=m
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_MAESTRO=m
CONFIG_USB_DSBR=m
@@ -707,7 +687,6 @@
##
CONFIG_MTD=m
# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_CONCAT=m
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
@@ -995,6 +974,7 @@
CONFIG_TOSHIBA_BT_RFKILL=m
CONFIG_ACPI_CMPC=m
CONFIG_INTEL_IPS=m
+CONFIG_SAMSUNG_LAPTOP=m
##
## file: drivers/pnp/Kconfig
@@ -1062,21 +1042,6 @@
CONFIG_PCMCIA_SYM53C500=m
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_JSM=m
-
-##
## file: drivers/sfi/Kconfig
##
CONFIG_SFI=y
@@ -1109,15 +1074,17 @@
# CONFIG_ET131X_DEBUG is not set
##
+## file: drivers/staging/generic_serial/Kconfig
+##
+CONFIG_SX=m
+
+##
## file: drivers/staging/lirc/Kconfig
##
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
-CONFIG_LIRC_I2C=m
CONFIG_LIRC_IGORPLUGUSB=m
CONFIG_LIRC_IMON=m
-CONFIG_LIRC_IT87=m
-CONFIG_LIRC_ITE8709=m
CONFIG_LIRC_SASEM=m
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
@@ -1153,11 +1120,6 @@
CONFIG_R8712U=m
##
-## file: drivers/staging/samsung-laptop/Kconfig
-##
-CONFIG_SAMSUNG_LAPTOP=m
-
-##
## file: drivers/staging/tm6000/Kconfig
##
CONFIG_VIDEO_TM6000=m
@@ -1201,6 +1163,39 @@
CONFIG_THERMAL_HWMON=y
##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_N_HDLC=m
+
+##
+## file: drivers/tty/hvc/Kconfig
+##
+CONFIG_HVC_XEN=y
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_JSM=m
+
+##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
@@ -1242,7 +1237,6 @@
CONFIG_FB_EFI=y
CONFIG_FB_N411=m
CONFIG_FB_HGA=m
-# CONFIG_FB_HGA_ACCEL is not set
CONFIG_FB_S1D13XXX=m
CONFIG_FB_NVIDIA=m
CONFIG_FB_NVIDIA_BACKLIGHT=y
@@ -1370,8 +1364,8 @@
##
## file: kernel/power/Kconfig
##
-# CONFIG_PM_TRACE_RTC is not set
# CONFIG_PM_TEST_SUSPEND is not set
+# CONFIG_PM_TRACE_RTC is not set
##
## file: kernel/trace/Kconfig
@@ -1390,7 +1384,9 @@
##
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_TRANSPARENT_HUGEPAGE=y
+## choice: Transparent Hugepage Support sysfs defaults
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+## end choice
##
## file: mm/Kconfig.debug
@@ -1532,3 +1528,15 @@
##
CONFIG_SND_HDA_INTEL=m
+##
+## file: unknown
+##
+# CONFIG_DRM_I830 is not set
+# CONFIG_FB_HGA_ACCEL is not set
+CONFIG_LIRC_I2C=m
+CONFIG_LIRC_IT87=m
+CONFIG_LIRC_ITE8709=m
+CONFIG_MTD_CONCAT=m
+CONFIG_RADIO_GEMTEK_PCI=m
+CONFIG_XEN_KBDDEV_FRONTEND=y
+
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32 Mon May 9 12:25:32 2011 (r17327)
@@ -35,7 +35,6 @@
CONFIG_SCx200=m
CONFIG_SCx200HR_TIMER=m
# CONFIG_OLPC is not set
-# CONFIG_OLPC_OPENFIRMWARE is not set
##
## file: arch/x86/Kconfig.cpu
@@ -113,12 +112,8 @@
##
## file: drivers/char/Kconfig
##
-# CONFIG_ISI is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
CONFIG_SONYPI=m
CONFIG_SCx200_GPIO=m
-CONFIG_CS5535_GPIO=m
##
## file: drivers/char/agp/Kconfig
@@ -350,7 +345,23 @@
CONFIG_PCMCIA_NINJA_SCSI=m
##
-## file: drivers/serial/Kconfig
+## file: drivers/staging/cs5535_gpio/Kconfig
+##
+CONFIG_CS5535_GPIO=m
+
+##
+## file: drivers/staging/tty/Kconfig
+##
+# CONFIG_RISCOM8 is not set
+# CONFIG_SPECIALIX is not set
+
+##
+## file: drivers/tty/Kconfig
+##
+# CONFIG_ISI is not set
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_8250_EXAR_ST16C554=m
@@ -458,3 +469,8 @@
##
CONFIG_SND_SIS7019=m
+##
+## file: unknown
+##
+# CONFIG_OLPC_OPENFIRMWARE is not set
+
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64 Mon May 9 12:25:32 2011 (r17327)
@@ -11,7 +11,6 @@
# CONFIG_MAXSMP is not set
CONFIG_NR_CPUS=512
CONFIG_NUMA=y
-CONFIG_K8_NUMA=y
CONFIG_X86_64_ACPI_NUMA=y
CONFIG_NUMA_EMU=y
CONFIG_PCI_MMCONFIG=y
@@ -46,16 +45,6 @@
CONFIG_BLK_DEV_RAM_SIZE=65536
##
-## file: drivers/char/Kconfig
-##
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_ISI=m
-CONFIG_SPECIALIX=m
-CONFIG_RIO=m
-CONFIG_RIO_OLDPCI=y
-
-##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=y
@@ -102,6 +91,24 @@
CONFIG_SCSI_INIA100=m
##
+## file: drivers/staging/generic_serial/Kconfig
+##
+CONFIG_RIO=m
+CONFIG_RIO_OLDPCI=y
+
+##
+## file: drivers/staging/tty/Kconfig
+##
+CONFIG_DIGIEPCA=m
+CONFIG_SPECIALIX=m
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_MOXA_INTELLIO=m
+CONFIG_ISI=m
+
+##
## file: drivers/video/Kconfig
##
# CONFIG_FB_NVIDIA_I2C is not set
@@ -138,3 +145,8 @@
##
CONFIG_LSM_MMAP_MIN_ADDR=65536
+##
+## file: unknown
+##
+CONFIG_K8_NUMA=y
+
Modified: dists/trunk/linux-2.6/debian/config/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/m68k/config Mon May 9 12:25:32 2011 (r17327)
@@ -1,5 +1,5 @@
##
-## file: arch/m68k/Kconfig
+## file: arch/m68k/Kconfig.mmu
##
# CONFIG_ADVANCED is not set
CONFIG_PROC_HARDWARE=y
@@ -15,9 +15,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_GEN_RTC_X=y
# CONFIG_DTLK is not set
@@ -123,11 +120,6 @@
# CONFIG_ISCSI_TCP is not set
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-
-##
## file: drivers/staging/Kconfig
##
# CONFIG_STAGING is not set
@@ -138,6 +130,18 @@
# CONFIG_PHONE is not set
##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+
+##
## file: drivers/w1/Kconfig
##
# CONFIG_W1 is not set
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.amiga Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.amiga Mon May 9 12:25:32 2011 (r17327)
@@ -1,6 +1,13 @@
##
## file: arch/m68k/Kconfig
##
+CONFIG_AMIGA_BUILTIN_SERIAL=y
+CONFIG_MULTIFACE_III_TTY=m
+CONFIG_SERIAL_CONSOLE=y
+
+##
+## file: arch/m68k/Kconfig.mmu
+##
CONFIG_AMIGA=y
# CONFIG_ATARI is not set
# CONFIG_MAC is not set
@@ -20,9 +27,6 @@
CONFIG_ZORRO=y
CONFIG_AMIGA_PCMCIA=y
# CONFIG_HEARTBEAT is not set
-CONFIG_AMIGA_BUILTIN_SERIAL=y
-CONFIG_MULTIFACE_III_TTY=m
-CONFIG_SERIAL_CONSOLE=y
##
## file: drivers/block/Kconfig
@@ -34,7 +38,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_A2232=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
@@ -185,7 +188,12 @@
CONFIG_SCSI_ZORRO7XX=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/staging/generic_serial/Kconfig
+##
+CONFIG_A2232=m
+
+##
+## file: drivers/tty/serial/Kconfig
##
# CONFIG_SERIAL_8250 is not set
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari Mon May 9 12:25:32 2011 (r17327)
@@ -1,6 +1,14 @@
##
## file: arch/m68k/Kconfig
##
+CONFIG_ATARI_MFPSER=m
+CONFIG_ATARI_MIDI=m
+CONFIG_ATARI_DSP56K=m
+CONFIG_SERIAL_CONSOLE=y
+
+##
+## file: arch/m68k/Kconfig.mmu
+##
# CONFIG_AMIGA is not set
CONFIG_ATARI=y
# CONFIG_MAC is not set
@@ -10,6 +18,10 @@
# CONFIG_SUN3X is not set
# CONFIG_Q40 is not set
# CONFIG_SUN3 is not set
+CONFIG_NATFEAT=y
+CONFIG_NFBLOCK=y
+CONFIG_NFCON=y
+CONFIG_NFETH=y
CONFIG_M68020=y
CONFIG_M68030=y
CONFIG_M68040=y
@@ -19,10 +31,6 @@
# CONFIG_M68KFPU_EMU_ONLY is not set
CONFIG_STRAM_PROC=y
CONFIG_HEARTBEAT=y
-CONFIG_ATARI_MFPSER=m
-CONFIG_ATARI_MIDI=m
-CONFIG_ATARI_DSP56K=m
-CONFIG_SERIAL_CONSOLE=y
##
## file: drivers/block/Kconfig
@@ -116,7 +124,7 @@
CONFIG_ATARI_SCSI=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/tty/serial/Kconfig
##
# CONFIG_SERIAL_8250 is not set
@@ -213,8 +221,4 @@
CONFIG_ATARI_ROM_ISA=y
CONFIG_ATARI_SCC=y
CONFIG_ATARI_SCC_DMA=y
-CONFIG_NATFEAT=y
-CONFIG_NFBLOCK=y
-CONFIG_NFCON=y
-CONFIG_NFETH=y
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000 Mon May 9 12:25:32 2011 (r17327)
@@ -1,6 +1,12 @@
##
## file: arch/m68k/Kconfig
##
+CONFIG_BVME6000_SCC=y
+CONFIG_SERIAL_CONSOLE=y
+
+##
+## file: arch/m68k/Kconfig.mmu
+##
# CONFIG_AMIGA is not set
# CONFIG_ATARI is not set
# CONFIG_MAC is not set
@@ -18,8 +24,6 @@
CONFIG_M68040=y
CONFIG_M68060=y
# CONFIG_M68KFPU_EMU is not set
-CONFIG_BVME6000_SCC=y
-CONFIG_SERIAL_CONSOLE=y
##
## file: drivers/char/Kconfig
@@ -77,7 +81,7 @@
CONFIG_BVME6000_SCSI=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_8250=m
CONFIG_SERIAL_8250_NR_UARTS=4
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mac Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mac Mon May 9 12:25:32 2011 (r17327)
@@ -1,6 +1,11 @@
##
## file: arch/m68k/Kconfig
##
+CONFIG_SERIAL_CONSOLE=y
+
+##
+## file: arch/m68k/Kconfig.mmu
+##
# CONFIG_AMIGA is not set
# CONFIG_ATARI is not set
CONFIG_MAC=y
@@ -18,7 +23,6 @@
CONFIG_M68KFPU_EMU_EXTRAPREC=y
# CONFIG_M68KFPU_EMU_ONLY is not set
# CONFIG_HEARTBEAT is not set
-CONFIG_SERIAL_CONSOLE=y
##
## file: drivers/block/Kconfig
@@ -115,7 +119,7 @@
CONFIG_SCSI_MAC_ESP=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/tty/serial/Kconfig
##
# CONFIG_SERIAL_8250 is not set
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mvme147
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mvme147 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mvme147 Mon May 9 12:25:32 2011 (r17327)
@@ -1,6 +1,12 @@
##
## file: arch/m68k/Kconfig
##
+CONFIG_MVME147_SCC=y
+CONFIG_SERIAL_CONSOLE=y
+
+##
+## file: arch/m68k/Kconfig.mmu
+##
# CONFIG_AMIGA is not set
# CONFIG_ATARI is not set
# CONFIG_MAC is not set
@@ -18,8 +24,6 @@
# CONFIG_M68040 is not set
# CONFIG_M68060 is not set
# CONFIG_M68KFPU_EMU is not set
-CONFIG_MVME147_SCC=y
-CONFIG_SERIAL_CONSOLE=y
##
## file: drivers/char/Kconfig
@@ -72,7 +76,7 @@
CONFIG_MVME147_SCSI=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/tty/serial/Kconfig
##
# CONFIG_SERIAL_8250 is not set
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x Mon May 9 12:25:32 2011 (r17327)
@@ -1,6 +1,12 @@
##
## file: arch/m68k/Kconfig
##
+CONFIG_MVME162_SCC=y
+CONFIG_SERIAL_CONSOLE=y
+
+##
+## file: arch/m68k/Kconfig.mmu
+##
# CONFIG_AMIGA is not set
# CONFIG_ATARI is not set
# CONFIG_MAC is not set
@@ -18,9 +24,6 @@
CONFIG_M68040=y
CONFIG_M68060=y
# CONFIG_M68KFPU_EMU is not set
-CONFIG_SERIAL167=y
-CONFIG_MVME162_SCC=y
-CONFIG_SERIAL_CONSOLE=y
##
## file: drivers/char/Kconfig
@@ -78,7 +81,12 @@
CONFIG_MVME16x_SCSI=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/staging/tty/Kconfig
+##
+CONFIG_SERIAL167=y
+
+##
+## file: drivers/tty/serial/Kconfig
##
# CONFIG_SERIAL_8250 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 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Mon May 9 12:25:32 2011 (r17327)
@@ -193,10 +193,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -493,7 +489,6 @@
##
CONFIG_MTD=m
# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_CONCAT=m
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
@@ -592,10 +587,6 @@
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
-
-##
-## file: drivers/mtd/ubi/Kconfig.debug
-##
# CONFIG_MTD_UBI_DEBUG is not set
##
@@ -835,7 +826,6 @@
## file: drivers/scsi/libsas/Kconfig
##
CONFIG_SCSI_SAS_LIBSAS=m
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
##
## file: drivers/scsi/megaraid/Kconfig.megaraid
@@ -857,21 +847,6 @@
CONFIG_SCSI_QLA_ISCSI=m
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_JSM=m
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
@@ -886,6 +861,29 @@
CONFIG_PHONE_IXJ=m
##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_JSM=m
+
+##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
@@ -1036,11 +1034,6 @@
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
##
-## file: kernel/power/Kconfig
-##
-# CONFIG_PM is not set
-
-##
## file: lib/Kconfig.debug
##
CONFIG_ENABLE_MUST_CHECK=y
@@ -1219,4 +1212,6 @@
## file: unknown
##
# CONFIG_BASLER_EXCITE is not set
+CONFIG_MTD_CONCAT=m
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Mon May 9 12:25:32 2011 (r17327)
@@ -196,10 +196,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -497,7 +493,6 @@
##
CONFIG_MTD=m
# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_CONCAT=m
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
@@ -596,10 +591,6 @@
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
-
-##
-## file: drivers/mtd/ubi/Kconfig.debug
-##
# CONFIG_MTD_UBI_DEBUG is not set
##
@@ -839,7 +830,6 @@
## file: drivers/scsi/libsas/Kconfig
##
CONFIG_SCSI_SAS_LIBSAS=m
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
##
## file: drivers/scsi/megaraid/Kconfig.megaraid
@@ -861,21 +851,6 @@
CONFIG_SCSI_QLA_ISCSI=m
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_JSM=m
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
@@ -890,6 +865,29 @@
CONFIG_PHONE_IXJ=m
##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_JSM=m
+
+##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
@@ -1040,11 +1038,6 @@
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
##
-## file: kernel/power/Kconfig
-##
-# CONFIG_PM is not set
-
-##
## file: lib/Kconfig.debug
##
CONFIG_ENABLE_MUST_CHECK=y
@@ -1223,4 +1216,6 @@
## file: unknown
##
# CONFIG_BASLER_EXCITE is not set
+CONFIG_MTD_CONCAT=m
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.octeon Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/mips/config.octeon Mon May 9 12:25:32 2011 (r17327)
@@ -4,6 +4,7 @@
## choice: System type
CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD=y
## end choice
+# CONFIG_HOTPLUG_CPU is not set
## choice: Kernel code model
# CONFIG_32BIT is not set
CONFIG_64BIT=y
@@ -13,7 +14,6 @@
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
-# CONFIG_HOTPLUG_CPU is not set
##
## file: arch/mips/cavium-octeon/Kconfig
@@ -99,7 +99,12 @@
CONFIG_MEGARAID_SAS=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/staging/octeon/Kconfig
+##
+CONFIG_OCTEON_ETHERNET=m
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
@@ -107,11 +112,6 @@
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
##
-## file: drivers/staging/octeon/Kconfig
-##
-CONFIG_OCTEON_ETHERNET=m
-
-##
## file: fs/ext2/Kconfig
##
CONFIG_EXT2_FS=y
@@ -122,11 +122,6 @@
CONFIG_EXT3_FS=y
##
-## file: kernel/power/Kconfig
-##
-# CONFIG_PM is not set
-
-##
## file: mm/Kconfig
##
## choice: Memory model
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Mon May 9 12:25:32 2011 (r17327)
@@ -113,9 +113,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
@@ -395,13 +392,6 @@
# CONFIG_SCSI_AIC7XXX is not set
##
-## file: drivers/serial/Kconfig
-##
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_IP22_ZILOG=y
-CONFIG_SERIAL_IP22_ZILOG_CONSOLE=y
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
@@ -409,14 +399,23 @@
CONFIG_SPI_BUTTERFLY=m
##
-## file: drivers/staging/cpia/Kconfig
+## file: drivers/telephony/Kconfig
##
-# CONFIG_VIDEO_CPIA is not set
+# CONFIG_PHONE is not set
##
-## file: drivers/telephony/Kconfig
+## file: drivers/tty/Kconfig
##
-# CONFIG_PHONE is not set
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_IP22_ZILOG=y
+CONFIG_SERIAL_IP22_ZILOG_CONSOLE=y
##
## file: drivers/video/Kconfig
@@ -555,6 +554,7 @@
##
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Mon May 9 12:25:32 2011 (r17327)
@@ -112,9 +112,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
@@ -289,7 +286,6 @@
##
## file: drivers/media/radio/Kconfig
##
-# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
@@ -467,16 +463,6 @@
# CONFIG_SCSI_QLA_FC is not set
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_JSM is not set
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
@@ -484,19 +470,26 @@
CONFIG_SPI_BUTTERFLY=m
##
-## file: drivers/staging/cpia/Kconfig
+## file: drivers/telephony/Kconfig
##
-# CONFIG_VIDEO_CPIA is not set
+# CONFIG_PHONE is not set
##
-## file: drivers/staging/stradis/Kconfig
+## file: drivers/tty/Kconfig
##
-# CONFIG_VIDEO_STRADIS is not set
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
##
-## file: drivers/telephony/Kconfig
+## file: drivers/tty/serial/Kconfig
##
-# CONFIG_PHONE is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_JSM is not set
##
## file: drivers/usb/Kconfig
@@ -683,7 +676,10 @@
CONFIG_INPUT_SGIO2_BTNS=m
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_STRADIS is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Mon May 9 12:25:32 2011 (r17327)
@@ -136,7 +136,6 @@
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
-CONFIG_PATA_PLATFORM=y
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
CONFIG_PATA_CMD64X=m
@@ -153,6 +152,7 @@
CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_VIA=m
CONFIG_PATA_MPIIX=m
+CONFIG_PATA_PLATFORM=y
##
## file: drivers/block/Kconfig
@@ -171,9 +171,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
@@ -346,7 +343,6 @@
##
## file: drivers/media/radio/Kconfig
##
-# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_USB_DSBR is not set
@@ -361,7 +357,6 @@
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_USB_SE401 is not set
##
## file: drivers/media/video/bt8xx/Kconfig
@@ -399,13 +394,6 @@
# CONFIG_USB_SN9C102 is not set
##
-## file: drivers/media/video/usbvideo/Kconfig
-##
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
-
-##
## file: drivers/media/video/zoran/Kconfig
##
# CONFIG_VIDEO_ZORAN is not set
@@ -572,14 +560,6 @@
CONFIG_SCSI_QLA_FC=m
##
-## file: drivers/serial/Kconfig
-##
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_SB1250_DUART=y
-CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
@@ -587,19 +567,24 @@
CONFIG_SPI_BUTTERFLY=m
##
-## file: drivers/staging/cpia/Kconfig
+## file: drivers/telephony/Kconfig
##
-# CONFIG_VIDEO_CPIA is not set
+# CONFIG_PHONE is not set
##
-## file: drivers/staging/stradis/Kconfig
+## file: drivers/tty/Kconfig
##
-# CONFIG_VIDEO_STRADIS is not set
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
##
-## file: drivers/telephony/Kconfig
+## file: drivers/tty/serial/Kconfig
##
-# CONFIG_PHONE is not set
+# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_SB1250_DUART=y
+CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
##
## file: drivers/usb/Kconfig
@@ -784,11 +769,18 @@
# CONFIG_LAN_SAA9730 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
CONFIG_SIBYTE_CFE=y
# CONFIG_SIMULATION is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
# CONFIG_USB_STV680 is not set
+# CONFIG_USB_VICAM is not set
+# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_STRADIS is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Mon May 9 12:25:32 2011 (r17327)
@@ -171,9 +171,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
@@ -352,7 +349,6 @@
##
## file: drivers/media/radio/Kconfig
##
-# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_USB_DSBR is not set
@@ -367,7 +363,6 @@
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_USB_SE401 is not set
##
## file: drivers/media/video/bt8xx/Kconfig
@@ -405,13 +400,6 @@
# CONFIG_USB_SN9C102 is not set
##
-## file: drivers/media/video/usbvideo/Kconfig
-##
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
-
-##
## file: drivers/media/video/zoran/Kconfig
##
# CONFIG_VIDEO_ZORAN is not set
@@ -578,14 +566,6 @@
CONFIG_SCSI_QLA_FC=m
##
-## file: drivers/serial/Kconfig
-##
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_SB1250_DUART=y
-CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
@@ -593,19 +573,24 @@
CONFIG_SPI_BUTTERFLY=m
##
-## file: drivers/staging/cpia/Kconfig
+## file: drivers/telephony/Kconfig
##
-# CONFIG_VIDEO_CPIA is not set
+# CONFIG_PHONE is not set
##
-## file: drivers/staging/stradis/Kconfig
+## file: drivers/tty/Kconfig
##
-# CONFIG_VIDEO_STRADIS is not set
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
##
-## file: drivers/telephony/Kconfig
+## file: drivers/tty/serial/Kconfig
##
-# CONFIG_PHONE is not set
+# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_SB1250_DUART=y
+CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
##
## file: drivers/usb/Kconfig
@@ -790,11 +775,18 @@
# CONFIG_LAN_SAA9730 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
CONFIG_SIBYTE_CFE=y
# CONFIG_SIMULATION is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
# CONFIG_USB_STV680 is not set
+# CONFIG_USB_VICAM is not set
+# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_STRADIS is not set
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f Mon May 9 12:25:32 2011 (r17327)
@@ -34,12 +34,6 @@
CONFIG_PATA_AMD=y
##
-## file: drivers/char/Kconfig
-##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-
-##
## file: drivers/cpufreq/Kconfig
##
## choice: Default CPUFreq governor
@@ -65,16 +59,22 @@
CONFIG_BLK_DEV_SD=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/staging/sm7xx/Kconfig
##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_FB_SM7XX=y
##
-## file: drivers/staging/sm7xx/Kconfig
+## file: drivers/tty/Kconfig
##
-CONFIG_FB_SM7XX=y
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_EXTENDED is not set
##
## file: drivers/usb/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Mon May 9 12:25:32 2011 (r17327)
@@ -119,9 +119,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_PRINTER is not set
# CONFIG_PPDEV is not set
# CONFIG_RTC is not set
@@ -279,7 +276,6 @@
##
## file: drivers/media/radio/Kconfig
##
-# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_USB_DSBR is not set
@@ -294,7 +290,6 @@
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_USB_SE401 is not set
##
## file: drivers/media/video/et61x251/Kconfig
@@ -312,13 +307,6 @@
# CONFIG_USB_SN9C102 is not set
##
-## file: drivers/media/video/usbvideo/Kconfig
-##
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
-
-##
## file: drivers/message/fusion/Kconfig
##
# CONFIG_FUSION is not set
@@ -341,7 +329,6 @@
##
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
@@ -567,16 +554,6 @@
CONFIG_SCSI_SYM53C8XX_2=m
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_JSM is not set
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
@@ -584,19 +561,26 @@
# CONFIG_SPI_BUTTERFLY is not set
##
-## file: drivers/staging/cpia/Kconfig
+## file: drivers/telephony/Kconfig
##
-# CONFIG_VIDEO_CPIA is not set
+# CONFIG_PHONE is not set
##
-## file: drivers/staging/stradis/Kconfig
+## file: drivers/tty/Kconfig
##
-# CONFIG_VIDEO_STRADIS is not set
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
##
-## file: drivers/telephony/Kconfig
+## file: drivers/tty/serial/Kconfig
##
-# CONFIG_PHONE is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_JSM is not set
##
## file: drivers/usb/Kconfig
@@ -780,6 +764,14 @@
# CONFIG_LAN_SAA9730 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
# CONFIG_USB_STV680 is not set
+# CONFIG_USB_VICAM is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_STRADIS is not set
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Mon May 9 12:25:32 2011 (r17327)
@@ -145,11 +145,7 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
-CONFIG_HVC_RTAS=y
CONFIG_NVRAM=y
CONFIG_DTLK=m
CONFIG_APPLICOM=m
@@ -439,7 +435,6 @@
##
## file: drivers/media/radio/Kconfig
##
-CONFIG_RADIO_GEMTEK_PCI=m
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_MAESTRO=m
CONFIG_USB_DSBR=m
@@ -699,7 +694,26 @@
CONFIG_PCMCIA_SYM53C500=m
##
-## file: drivers/serial/Kconfig
+## file: drivers/telephony/Kconfig
+##
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/hvc/Kconfig
+##
+CONFIG_HVC_RTAS=y
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
@@ -712,13 +726,6 @@
CONFIG_SERIAL_JSM=m
##
-## file: drivers/telephony/Kconfig
-##
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-
-##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
@@ -986,3 +993,8 @@
CONFIG_SND_POWERMAC=m
CONFIG_SND_POWERMAC_AUTO_DRC=y
+##
+## file: unknown
+##
+CONFIG_RADIO_GEMTEK_PCI=m
+
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Mon May 9 12:25:32 2011 (r17327)
@@ -72,16 +72,16 @@
CONFIG_FEC_MPC52xx_MDIO=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/spi/Kconfig
##
-CONFIG_SERIAL_MPC52xx=y
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
-CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
+CONFIG_SPI_MPC52xx_PSC=m
##
-## file: drivers/spi/Kconfig
+## file: drivers/tty/serial/Kconfig
##
-CONFIG_SPI_MPC52xx_PSC=m
+CONFIG_SERIAL_MPC52xx=y
+CONFIG_SERIAL_MPC52xx_CONSOLE=y
+CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Mon May 9 12:25:32 2011 (r17327)
@@ -93,12 +93,6 @@
# CONFIG_MAC_FLOPPY is not set
##
-## file: drivers/char/Kconfig
-##
-CONFIG_HVC_CONSOLE=y
-CONFIG_HVCS=m
-
-##
## file: drivers/char/hw_random/Kconfig
##
CONFIG_HW_RANDOM=m
@@ -162,7 +156,13 @@
CONFIG_MEGARAID_LEGACY=m
##
-## file: drivers/serial/Kconfig
+## file: drivers/tty/hvc/Kconfig
+##
+CONFIG_HVC_CONSOLE=y
+CONFIG_HVCS=m
+
+##
+## file: drivers/tty/serial/Kconfig
##
# CONFIG_SERIAL_ICOM is not set
Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/s390/config Mon May 9 12:25:32 2011 (r17327)
@@ -10,7 +10,6 @@
CONFIG_PACK_STACK=y
# CONFIG_SMALL_STACK is not set
# CONFIG_CHECK_STACK is not set
-# CONFIG_WARN_STACK is not set
CONFIG_QDIO=y
CONFIG_IPL=y
CONFIG_PFAULT=y
@@ -40,11 +39,6 @@
# CONFIG_CDROM_PKTCDVD is not set
##
-## file: drivers/char/Kconfig
-##
-CONFIG_HVC_IUCV=y
-
-##
## file: drivers/crypto/Kconfig
##
CONFIG_ZCRYPT=m
@@ -131,6 +125,11 @@
CONFIG_ZFCP=m
##
+## file: drivers/tty/hvc/Kconfig
+##
+CONFIG_HVC_IUCV=y
+
+##
## file: drivers/watchdog/Kconfig
##
CONFIG_ZVM_WATCHDOG=m
@@ -191,3 +190,8 @@
##
# CONFIG_WAN_ROUTER is not set
+##
+## file: unknown
+##
+# CONFIG_WARN_STACK is not set
+
Modified: dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r Mon May 9 12:25:32 2011 (r17327)
@@ -49,14 +49,6 @@
CONFIG_PATA_PLATFORM=y
##
-## file: drivers/char/Kconfig
-##
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-
-##
## file: drivers/hid/Kconfig
##
CONFIG_HID_SUPPORT=y
@@ -86,7 +78,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLKDEVS=y
@@ -137,13 +128,6 @@
CONFIG_BLK_DEV_SD=y
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=6
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-
-##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
@@ -151,6 +135,21 @@
CONFIG_SPI_SH_SCI=y
##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=6
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+
+##
## file: drivers/usb/Kconfig
##
CONFIG_USB_SUPPORT=y
@@ -210,5 +209,6 @@
##
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_MTD_CONCAT=y
CONFIG_SH_PCIDMA_NONCOHERENT=y
Modified: dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr Mon May 9 12:25:32 2011 (r17327)
@@ -47,16 +47,6 @@
CONFIG_SATA_SIL=y
##
-## file: drivers/char/Kconfig
-##
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-
-##
## file: drivers/dma/Kconfig
##
CONFIG_DMADEVICES=y
@@ -132,7 +122,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLKDEVS=y
@@ -182,7 +171,17 @@
CONFIG_BLK_DEV_SD=y
##
-## file: drivers/serial/Kconfig
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=6
@@ -263,6 +262,7 @@
##
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_MTD_CONCAT=y
CONFIG_PMB_ENABLE=y
CONFIG_PMB_FIXED=y
CONFIG_SH_PCIDMA_NONCOHERENT=y
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config Mon May 9 11:42:17 2011 (r17326)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Mon May 9 12:25:32 2011 (r17327)
@@ -37,9 +37,6 @@
##
## file: drivers/char/Kconfig
##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
@@ -233,14 +230,8 @@
# CONFIG_INPUT_TOUCHSCREEN is not set
##
-## file: drivers/media/Kconfig
-##
-CONFIG_VIDEO_V4L1_COMPAT=y
-
-##
## file: drivers/media/radio/Kconfig
##
-# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_USB_DSBR is not set
@@ -398,7 +389,19 @@
CONFIG_MEGARAID_LEGACY=m
##
-## file: drivers/serial/Kconfig
+## file: drivers/telephony/Kconfig
+##
+# CONFIG_PHONE is not set
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+##
+## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_SUNZILOG=y
CONFIG_SERIAL_SUNZILOG_CONSOLE=y
@@ -410,21 +413,6 @@
CONFIG_SERIAL_JSM=m
##
-## file: drivers/staging/cpia/Kconfig
-##
-# CONFIG_VIDEO_CPIA is not set
-
-##
-## file: drivers/staging/stradis/Kconfig
-##
-# CONFIG_VIDEO_STRADIS is not set
-
-##
-## file: drivers/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
@@ -650,7 +638,11 @@
##
## file: unknown
##
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_STRADIS is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
More information about the Kernel-svn-changes
mailing list