From fea964492fbec7ccfa93858af6e984be0ced0ea8 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 22 Jul 2011 19:48:23 +0000 Subject: [PATCH] debian/config: Reorder. svn path=/dists/trunk/linux-2.6/; revision=17846 --- debian/config/armel/config.ixp4xx | 1 - debian/config/armhf/config.mx5 | 4 - debian/config/armhf/config.omap | 458 ++++++++++++++-------------- debian/config/kernelarch-x86/config | 6 - debian/config/mips/config.octeon | 6 +- 5 files changed, 229 insertions(+), 246 deletions(-) diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 2aa1840a51c0..11b277ef669c 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -791,4 +791,3 @@ CONFIG_SND_PCXHR=m ## # CONFIG_SND_HDA_INTEL is not set - diff --git a/debian/config/armhf/config.mx5 b/debian/config/armhf/config.mx5 index bcb3e3cb1a91..56d4b24996c7 100644 --- a/debian/config/armhf/config.mx5 +++ b/debian/config/armhf/config.mx5 @@ -19,10 +19,6 @@ 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 diff --git a/debian/config/armhf/config.omap b/debian/config/armhf/config.omap index be7ae94968a0..0e2142c1bf15 100644 --- a/debian/config/armhf/config.omap +++ b/debian/config/armhf/config.omap @@ -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 @@ CONFIG_ARM_THUMBEE=y ## ## 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_MUX_WARNINGS=y 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,87 +48,14 @@ CONFIG_OMAP_PM_NOOP=y ## end choice ## -## file: arch/arm/mach-omap2/Kconfig +## file: drivers/bluetooth/Kconfig ## -CONFIG_ARCH_OMAP2PLUS_TYPICAL=y -# CONFIG_ARCH_OMAP2 is not set - -## -## file: drivers/i2c/busses/Kconfig -## -CONFIG_I2C_GPIO=y -CONFIG_I2C_OMAP=y - -## -## file: drivers/spi/Kconfig -## -CONFIG_SPI=y -CONFIG_SPI_GPIO=y -CONFIG_SPI_OMAP24XX=y -CONFIG_SPI_SPIDEV=y - -## -## file: drivers/gpio/Kconfig -## -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_TWL4030=y - -## -## file: drivers/usb/Kconfig -## note: needed to be buildin by MUSB -## -CONFIG_USB=y - -## -## file: drivers/usb/musb/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 - -## -## file: drivers/usb/gadget/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 - -## -## file: drivers/usb/otg/Kconfig -## -CONFIG_USB_OTG_UTILS=y -CONFIG_TWL4030_USB=y -CONFIG_TWL6030_USB=y -CONFIG_NOP_USB_XCEIV=y - -## -## file: drivers/usb/host/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 - -## -## file: drivers/leds/Kconfig -## -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_GPIO_PLATFORM=y -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_LP5523=m +CONFIG_BT_WILINK=m ## ## file: drivers/cpufreq/Kconfig ## CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=y ## @@ -137,59 +65,23 @@ CONFIG_CRYPTO_DEV_OMAP_SHAM=m CONFIG_CRYPTO_DEV_OMAP_AES=m ## -## file: drivers/watchdog/Kconfig +## file: drivers/gpio/Kconfig ## -CONFIG_OMAP_WATCHDOG=m -CONFIG_TWL4030_WATCHDOG=m +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_TWL4030=y ## -## file: drivers/video/Kconfig +## file: drivers/i2c/busses/Kconfig ## -CONFIG_FB=y -CONFIG_VIDEO_OUTPUT_CONTROL=y - -## -## file: drivers/video/omap/Kconfig -## -CONFIG_FB_OMAP_BOOTLOADER_INIT=y - -## -## file: drivers/video/omap2/Kconfig -## -CONFIG_OMAP2_VRAM=y -CONFIG_OMAP2_VRFB=y - -## -## file: drivers/video/omap2/dss/Kconfig -## -CONFIG_OMAP2_DSS=y -CONFIG_OMAP2_DSS_VENC=y -CONFIG_OMAP4_DSS_HDMI=y -CONFIG_OMAP2_DSS_SDI=y - -## -## file: drivers/video/omap2/omapfb/Kconfig -## -CONFIG_FB_OMAP2=y - -## -## file: drivers/video/omap/displays/Kconfig -## -CONFIG_PANEL_GENERIC_DPI=y -CONFIG_PANEL_ACX565AKM=y - -## -## file: drivers/video/console/Kconfig -## -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_I2C_GPIO=y +CONFIG_I2C_OMAP=y ## ## file: drivers/input/keyboard/Kconfig ## CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_TWL4030=y CONFIG_KEYBOARD_OMAP4=y +CONFIG_KEYBOARD_TWL4030=y ## ## file: drivers/input/misc/Kconfig @@ -204,112 +96,13 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_TSC2005=m ## -## file: drivers/regulator/Kconfig +## file: drivers/leds/Kconfig ## -CONFIG_REGULATOR=y -CONFIG_REGULATOR_TWL4030=y - -## -## drivers/media/video/omap/Kconfig -## -CONFIG_VIDEO_OMAP2_VOUT=m - -## -## file: drivers/staging/iio/Kconfig -## -CONFIG_IIO=m - -## -## file: drivers/staging/iio/light/Kconfig -## -CONFIG_SENSORS_TSL2563=m - -## -## file: drivers/staging/iio/accel/Kconfig -## -CONFIG_LIS3L02DQ=m - -## -## file: drivers/rtc/Kconfig -## -CONFIG_RTC_DRV_TWL4030=m - -## -## file: drivers/net/wireless/wl12xx/Kconfig -## -CONFIG_WL12XX=m -CONFIG_WL1251=m -CONFIG_WL1251_SPI=m - -## -## file: sound/soc/Kconfig -## -CONFIG_SND_SOC=m - -## -## file: sound/soc/omap/Kconfig -## -CONFIG_SND_OMAP_SOC=m -CONFIG_SND_OMAP_SOC_RX51=m -CONFIG_SND_OMAP_SOC_SDP4430=m - -## -## file: net/phonet/Kconfig -## -CONFIG_PHONET=m - -## -## file: drivers/power/Kconfig -## -CONFIG_BATTERY_BQ27x00=m -CONFIG_CHARGER_ISP1704=m - -## -## file: drivers/staging/tidspbridge/Kconfig -## -CONFIG_TIDSPBRIDGE=m -CONFIG_TIDSPBRIDGE_DVFS=y -CONFIG_TIDSPBRIDGE_RECOVERY=y - -## -## file: drivers/mmc/Kconfig -## -CONFIG_MMC=y -CONFIG_MMC_SDHCI=m - -## -## file: drivers/mmc/host/Kconfig -## -CONFIG_MMC_OMAP=y -CONFIG_MMC_OMAP_HS=y -CONFIG_MMC_SPI=m - -## -## file: drivers/mtd/Kconfig -## -CONFIG_MTD=y - -## -## file: drivers/mtd/nand/Kconfig -## -CONFIG_MTD_NAND_ECC=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_OMAP2=y - -## -## file: drivers/mtd/onenand/Kconfig -## -CONFIG_MTD_ONENAND=y -CONFIG_MTD_ONENAND_OMAP2=y - -## -## file: kernel/power/Kconfig -## -CONFIG_PM=y -CONFIG_PM_SLEEP=y -CONFIG_SUSPEND=y -CONFIG_APM_EMULATION=y -CONFIG_PM_RUNTIME=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_GPIO_PLATFORM=y +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_TRIGGER_GPIO=m ## ## file: drivers/media/Kconfig @@ -324,12 +117,213 @@ CONFIG_RADIO_ADAPTERS=y CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m +## +## file: drivers/media/video/omap/Kconfig +## +CONFIG_VIDEO_OMAP2_VOUT=m + ## ## file: drivers/misc/ti-st/Kconfig ## CONFIG_TI_ST=m ## -## file: drivers/bluetooth/Kconfig +## file: drivers/mmc/Kconfig ## -CONFIG_BT_WILINK=m +CONFIG_MMC=y + +## +## file: drivers/mmc/host/Kconfig +## +CONFIG_MMC_SDHCI=m +CONFIG_MMC_OMAP=y +CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_SPI=m + +## +## file: drivers/mtd/Kconfig +## +CONFIG_MTD=y + +## +## file: drivers/mtd/nand/Kconfig +## +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_OMAP2=y + +## +## file: drivers/mtd/onenand/Kconfig +## +CONFIG_MTD_ONENAND=y +CONFIG_MTD_ONENAND_OMAP2=y + +## +## file: drivers/net/wireless/wl1251/Kconfig +## +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m + +## +## file: drivers/net/wireless/wl12xx/Kconfig +## +CONFIG_WL12XX=m + +## +## file: drivers/power/Kconfig +## +CONFIG_BATTERY_BQ27x00=m +CONFIG_CHARGER_ISP1704=m + +## +## file: drivers/regulator/Kconfig +## +CONFIG_REGULATOR=y +CONFIG_REGULATOR_TWL4030=y + +## +## file: drivers/rtc/Kconfig +## +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 +## +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/tidspbridge/Kconfig +## +CONFIG_TIDSPBRIDGE=m +CONFIG_TIDSPBRIDGE_DVFS=y +CONFIG_TIDSPBRIDGE_RECOVERY=y + +## +## file: drivers/usb/Kconfig +## +CONFIG_USB=y + +## +## file: drivers/usb/gadget/Kconfig +## +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: drivers/usb/host/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 + +## +## file: drivers/usb/musb/Kconfig +## +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: drivers/usb/otg/Kconfig +## +CONFIG_TWL4030_USB=y +CONFIG_TWL6030_USB=y +CONFIG_NOP_USB_XCEIV=y + +## +## file: drivers/video/Kconfig +## +CONFIG_VIDEO_OUTPUT_CONTROL=y +CONFIG_FB=y + +## +## file: drivers/video/console/Kconfig +## +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y + +## +## file: drivers/video/omap/Kconfig +## +CONFIG_FB_OMAP_BOOTLOADER_INIT=y + +## +## file: drivers/video/omap2/displays/Kconfig +## +CONFIG_PANEL_GENERIC_DPI=y +CONFIG_PANEL_ACX565AKM=y + +## +## file: drivers/video/omap2/dss/Kconfig +## +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_DSS_VENC=y +CONFIG_OMAP4_DSS_HDMI=y +CONFIG_OMAP2_DSS_SDI=y + +## +## file: drivers/video/omap2/omapfb/Kconfig +## +CONFIG_FB_OMAP2=y + +## +## file: drivers/watchdog/Kconfig +## +CONFIG_OMAP_WATCHDOG=m +CONFIG_TWL4030_WATCHDOG=m + +## +## file: kernel/power/Kconfig +## +CONFIG_SUSPEND=y +CONFIG_PM_RUNTIME=y +CONFIG_APM_EMULATION=y + +## +## file: net/phonet/Kconfig +## +CONFIG_PHONET=m + +## +## file: sound/soc/Kconfig +## +CONFIG_SND_SOC=m + +## +## file: sound/soc/omap/Kconfig +## +CONFIG_SND_OMAP_SOC=m +CONFIG_SND_OMAP_SOC_RX51=m +CONFIG_SND_OMAP_SOC_SDP4430=m + diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 2457ce98d388..f46889d843a4 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1143,12 +1143,6 @@ CONFIG_COMEDI_NI_660X=m 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 diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon index 5d6831026a33..cf216bb0db46 100644 --- a/debian/config/mips/config.octeon +++ b/debian/config/mips/config.octeon @@ -36,7 +36,7 @@ CONFIG_ATA_SFF=y 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_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y ## -## file drivers/message/fusion +## file: drivers/message/fusion/Kconfig ## CONFIG_FUSION=y CONFIG_FUSION_SAS=y @@ -73,7 +73,6 @@ CONFIG_FUSION_SAS=y ## file: drivers/mtd/Kconfig ## CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y @@ -145,4 +144,5 @@ CONFIG_SPARSEMEM_MANUAL=y ## file: unknown ## CONFIG_CAVIUM_OCTEON_SPECIFIC_OPTIONS=y +CONFIG_MTD_PARTITIONS=y