[kernel] r17846 - in dists/trunk/linux-2.6/debian/config: armel armhf kernelarch-x86 mips
Bastian Blank
waldi at alioth.debian.org
Fri Jul 22 19:48:24 UTC 2011
Author: waldi
Date: Fri Jul 22 19:48:23 2011
New Revision: 17846
Log:
debian/config: Reorder.
Modified:
dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
dists/trunk/linux-2.6/debian/config/armhf/config.mx5
dists/trunk/linux-2.6/debian/config/armhf/config.omap
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
dists/trunk/linux-2.6/debian/config/mips/config.octeon
Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Fri Jul 22 19:45:19 2011 (r17845)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Fri Jul 22 19:48:23 2011 (r17846)
@@ -791,4 +791,3 @@
##
# CONFIG_SND_HDA_INTEL is not set
-
Modified: dists/trunk/linux-2.6/debian/config/armhf/config.mx5
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config.mx5 Fri Jul 22 19:45:19 2011 (r17845)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.mx5 Fri Jul 22 19:48:23 2011 (r17846)
@@ -19,10 +19,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/armhf/config.omap
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config.omap Fri Jul 22 19:45:19 2011 (r17845)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.omap Fri Jul 22 19:48:23 2011 (r17846)
@@ -4,12 +4,18 @@
## choice: ARM system type
CONFIG_ARCH_OMAP=y
## end choice
-CONFIG_NEON=y
CONFIG_SMP=y
CONFIG_SMP_ON_UP=y
CONFIG_HIGHMEM=y
CONFIG_LEDS=y
CONFIG_LEDS_CPU=y
+CONFIG_NEON=y
+
+##
+## file: arch/arm/mach-omap2/Kconfig
+##
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
+# CONFIG_ARCH_OMAP2 is not set
##
## file: arch/arm/mm/Kconfig
@@ -19,11 +25,9 @@
##
## file: arch/arm/plat-omap/Kconfig
##
-## choice: OMAP system type
+## choice: OMAP System Type
CONFIG_ARCH_OMAP2PLUS=y
## end choice
-# CONFIG_OMAP_DEBUG_DEVICES is not set
-CONFIG_OMAP_DEBUG_LEDS=y
CONFIG_OMAP_RESET_CLOCKS=y
CONFIG_OMAP_MUX=y
# CONFIG_OMAP_MUX_DEBUG is not set
@@ -31,12 +35,9 @@
CONFIG_OMAP_MCBSP=y
CONFIG_OMAP_MBOX_FWK=y
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-CONFIG_OMAP_IOMMU=y
# CONFIG_OMAP_IOMMU_DEBUG is not set
-## choice: System timer
# CONFIG_OMAP_MPU_TIMER is not set
CONFIG_OMAP_32K_TIMER=y
-## end choice
# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
CONFIG_OMAP_32K_TIMER_HZ=128
CONFIG_OMAP_DM_TIMER=y
@@ -47,24 +48,21 @@
## end choice
##
-## file: arch/arm/mach-omap2/Kconfig
+## file: drivers/bluetooth/Kconfig
##
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
-# CONFIG_ARCH_OMAP2 is not set
+CONFIG_BT_WILINK=m
##
-## file: drivers/i2c/busses/Kconfig
+## file: drivers/cpufreq/Kconfig
##
-CONFIG_I2C_GPIO=y
-CONFIG_I2C_OMAP=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=y
##
-## file: drivers/spi/Kconfig
+## file: drivers/crypto/Kconfig
##
-CONFIG_SPI=y
-CONFIG_SPI_GPIO=y
-CONFIG_SPI_OMAP24XX=y
-CONFIG_SPI_SPIDEV=y
+CONFIG_CRYPTO_DEV_OMAP_SHAM=m
+CONFIG_CRYPTO_DEV_OMAP_AES=m
##
## file: drivers/gpio/Kconfig
@@ -73,46 +71,29 @@
CONFIG_GPIO_TWL4030=y
##
-## file: drivers/usb/Kconfig
-## note: needed to be buildin by MUSB
-##
-CONFIG_USB=y
-
-##
-## file: drivers/usb/musb/Kconfig
+## file: drivers/i2c/busses/Kconfig
##
-CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_USB_MUSB_OTG=y
-CONFIG_USB_GADGET_MUSB_HDRC=y
-CONFIG_USB_MUSB_HDRC_HCD=y
+CONFIG_I2C_GPIO=y
+CONFIG_I2C_OMAP=y
##
-## file: drivers/usb/gadget/Kconfig
+## file: drivers/input/keyboard/Kconfig
##
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MUSB_HDRC=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_G_NOKIA=m
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_OMAP4=y
+CONFIG_KEYBOARD_TWL4030=y
##
-## file: drivers/usb/otg/Kconfig
+## file: drivers/input/misc/Kconfig
##
-CONFIG_USB_OTG_UTILS=y
-CONFIG_TWL4030_USB=y
-CONFIG_TWL6030_USB=y
-CONFIG_NOP_USB_XCEIV=y
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
##
-## file: drivers/usb/host/Kconfig
+## file: drivers/input/touchscreen/Kconfig
##
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_HCD_OMAP=y
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_OMAP3=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_TSC2005=m
##
## file: drivers/leds/Kconfig
@@ -120,88 +101,78 @@
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_TRIGGER_GPIO=m
CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_TRIGGER_GPIO=m
##
-## file: drivers/cpufreq/Kconfig
-##
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_STAT=y
-
-##
-## file: drivers/crypto/Kconfig
+## file: drivers/media/Kconfig
##
-CONFIG_CRYPTO_DEV_OMAP_SHAM=m
-CONFIG_CRYPTO_DEV_OMAP_AES=m
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
##
-## file: drivers/watchdog/Kconfig
+## file: drivers/media/radio/Kconfig
##
-CONFIG_OMAP_WATCHDOG=m
-CONFIG_TWL4030_WATCHDOG=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
##
-## file: drivers/video/Kconfig
+## file: drivers/media/video/omap/Kconfig
##
-CONFIG_FB=y
-CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_VIDEO_OMAP2_VOUT=m
##
-## file: drivers/video/omap/Kconfig
+## file: drivers/misc/ti-st/Kconfig
##
-CONFIG_FB_OMAP_BOOTLOADER_INIT=y
+CONFIG_TI_ST=m
##
-## file: drivers/video/omap2/Kconfig
+## file: drivers/mmc/Kconfig
##
-CONFIG_OMAP2_VRAM=y
-CONFIG_OMAP2_VRFB=y
+CONFIG_MMC=y
##
-## file: drivers/video/omap2/dss/Kconfig
+## file: drivers/mmc/host/Kconfig
##
-CONFIG_OMAP2_DSS=y
-CONFIG_OMAP2_DSS_VENC=y
-CONFIG_OMAP4_DSS_HDMI=y
-CONFIG_OMAP2_DSS_SDI=y
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_OMAP=y
+CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_SPI=m
##
-## file: drivers/video/omap2/omapfb/Kconfig
+## file: drivers/mtd/Kconfig
##
-CONFIG_FB_OMAP2=y
+CONFIG_MTD=y
##
-## file: drivers/video/omap/displays/Kconfig
+## file: drivers/mtd/nand/Kconfig
##
-CONFIG_PANEL_GENERIC_DPI=y
-CONFIG_PANEL_ACX565AKM=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_OMAP2=y
##
-## file: drivers/video/console/Kconfig
+## file: drivers/mtd/onenand/Kconfig
##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_MTD_ONENAND=y
+CONFIG_MTD_ONENAND_OMAP2=y
##
-## file: drivers/input/keyboard/Kconfig
+## file: drivers/net/wireless/wl1251/Kconfig
##
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_TWL4030=y
-CONFIG_KEYBOARD_OMAP4=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
##
-## file: drivers/input/misc/Kconfig
+## file: drivers/net/wireless/wl12xx/Kconfig
##
-CONFIG_INPUT_TWL4030_PWRBUTTON=m
-CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_WL12XX=m
##
-## file: drivers/input/touchscreen/Kconfig
+## file: drivers/power/Kconfig
##
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_CHARGER_ISP1704=m
##
## file: drivers/regulator/Kconfig
@@ -210,9 +181,17 @@
CONFIG_REGULATOR_TWL4030=y
##
-## drivers/media/video/omap/Kconfig
+## file: drivers/rtc/Kconfig
##
-CONFIG_VIDEO_OMAP2_VOUT=m
+CONFIG_RTC_DRV_TWL4030=m
+
+##
+## file: drivers/spi/Kconfig
+##
+CONFIG_SPI=y
+CONFIG_SPI_GPIO=y
+CONFIG_SPI_OMAP24XX=y
+CONFIG_SPI_SPIDEV=y
##
## file: drivers/staging/iio/Kconfig
@@ -220,116 +199,131 @@
CONFIG_IIO=m
##
+## file: drivers/staging/iio/accel/Kconfig
+##
+CONFIG_LIS3L02DQ=m
+
+##
## file: drivers/staging/iio/light/Kconfig
##
CONFIG_SENSORS_TSL2563=m
##
-## file: drivers/staging/iio/accel/Kconfig
+## file: drivers/staging/tidspbridge/Kconfig
##
-CONFIG_LIS3L02DQ=m
+CONFIG_TIDSPBRIDGE=m
+CONFIG_TIDSPBRIDGE_DVFS=y
+CONFIG_TIDSPBRIDGE_RECOVERY=y
##
-## file: drivers/rtc/Kconfig
+## file: drivers/usb/Kconfig
##
-CONFIG_RTC_DRV_TWL4030=m
+CONFIG_USB=y
##
-## file: drivers/net/wireless/wl12xx/Kconfig
+## file: drivers/usb/gadget/Kconfig
##
-CONFIG_WL12XX=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
+CONFIG_USB_GADGET=y
+## choice: USB Peripheral Controller
+CONFIG_USB_GADGET_MUSB_HDRC=y
+## end choice
+## choice: USB Gadget Drivers
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_G_NOKIA=m
+## end choice
##
-## file: sound/soc/Kconfig
+## file: drivers/usb/host/Kconfig
##
-CONFIG_SND_SOC=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_HCD_OMAP=y
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_OMAP3=y
##
-## file: sound/soc/omap/Kconfig
+## file: drivers/usb/musb/Kconfig
##
-CONFIG_SND_OMAP_SOC=m
-CONFIG_SND_OMAP_SOC_RX51=m
-CONFIG_SND_OMAP_SOC_SDP4430=m
+CONFIG_USB_MUSB_HDRC=y
+## choice: Platform Glue Layer
+CONFIG_USB_MUSB_OMAP2PLUS=y
+## end choice
+## choice: Driver Mode
+CONFIG_USB_MUSB_OTG=y
+## end choice
##
-## file: net/phonet/Kconfig
+## file: drivers/usb/otg/Kconfig
##
-CONFIG_PHONET=m
+CONFIG_TWL4030_USB=y
+CONFIG_TWL6030_USB=y
+CONFIG_NOP_USB_XCEIV=y
##
-## file: drivers/power/Kconfig
+## file: drivers/video/Kconfig
##
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_CHARGER_ISP1704=m
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_FB=y
##
-## file: drivers/staging/tidspbridge/Kconfig
+## file: drivers/video/console/Kconfig
##
-CONFIG_TIDSPBRIDGE=m
-CONFIG_TIDSPBRIDGE_DVFS=y
-CONFIG_TIDSPBRIDGE_RECOVERY=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
##
-## file: drivers/mmc/Kconfig
+## file: drivers/video/omap/Kconfig
##
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=m
+CONFIG_FB_OMAP_BOOTLOADER_INIT=y
##
-## file: drivers/mmc/host/Kconfig
+## file: drivers/video/omap2/displays/Kconfig
##
-CONFIG_MMC_OMAP=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MMC_SPI=m
+CONFIG_PANEL_GENERIC_DPI=y
+CONFIG_PANEL_ACX565AKM=y
##
-## file: drivers/mtd/Kconfig
+## file: drivers/video/omap2/dss/Kconfig
##
-CONFIG_MTD=y
+CONFIG_OMAP2_DSS=y
+CONFIG_OMAP2_DSS_VENC=y
+CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP2_DSS_SDI=y
##
-## file: drivers/mtd/nand/Kconfig
+## file: drivers/video/omap2/omapfb/Kconfig
##
-CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_OMAP2=y
+CONFIG_FB_OMAP2=y
##
-## file: drivers/mtd/onenand/Kconfig
+## file: drivers/watchdog/Kconfig
##
-CONFIG_MTD_ONENAND=y
-CONFIG_MTD_ONENAND_OMAP2=y
+CONFIG_OMAP_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
##
## file: kernel/power/Kconfig
##
-CONFIG_PM=y
-CONFIG_PM_SLEEP=y
CONFIG_SUSPEND=y
-CONFIG_APM_EMULATION=y
CONFIG_PM_RUNTIME=y
+CONFIG_APM_EMULATION=y
##
-## file: drivers/media/Kconfig
+## file: net/phonet/Kconfig
##
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
+CONFIG_PHONET=m
##
-## file: drivers/media/radio/Kconfig
+## file: sound/soc/Kconfig
##
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
+CONFIG_SND_SOC=m
##
-## file: drivers/misc/ti-st/Kconfig
+## file: sound/soc/omap/Kconfig
##
-CONFIG_TI_ST=m
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_RX51=m
+CONFIG_SND_OMAP_SOC_SDP4430=m
-##
-## file: drivers/bluetooth/Kconfig
-##
-CONFIG_BT_WILINK=m
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Jul 22 19:45:19 2011 (r17845)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Jul 22 19:48:23 2011 (r17846)
@@ -1143,12 +1143,6 @@
CONFIG_COMEDI_NI_670X=m
CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
CONFIG_COMEDI_RTD520=m
CONFIG_COMEDI_S526=m
CONFIG_COMEDI_S626=m
Modified: dists/trunk/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.octeon Fri Jul 22 19:45:19 2011 (r17845)
+++ dists/trunk/linux-2.6/debian/config/mips/config.octeon Fri Jul 22 19:48:23 2011 (r17846)
@@ -36,7 +36,7 @@
CONFIG_PATA_OCTEON_CF=y
##
-## file: drivers/char/hw_random
+## file: drivers/char/hw_random/Kconfig
##
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_OCTEON=y
@@ -64,7 +64,7 @@
CONFIG_MOUSE_PS2=y
##
-## file drivers/message/fusion
+## file: drivers/message/fusion/Kconfig
##
CONFIG_FUSION=y
CONFIG_FUSION_SAS=y
@@ -73,7 +73,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
@@ -145,4 +144,5 @@
## file: unknown
##
CONFIG_CAVIUM_OCTEON_SPECIFIC_OPTIONS=y
+CONFIG_MTD_PARTITIONS=y
More information about the Kernel-svn-changes
mailing list