diff --git a/debian/config/armhf/config.mx5 b/debian/config/armhf/config.mx5 index 4932b4dd6..631c7ef24 100644 --- a/debian/config/armhf/config.mx5 +++ b/debian/config/armhf/config.mx5 @@ -14,13 +14,14 @@ CONFIG_NEON=y ## ## file: arch/arm/mach-mx5/Kconfig ## -CONFIG_SOC_IMX51=y CONFIG_MACH_MX51_EFIKAMX=y ## ## file: arch/arm/plat-mxc/Kconfig ## +## choice: Freescale CPU family: CONFIG_ARCH_MX51=y +## end choice #. Enable PWM driver CONFIG_MXC_PWM=y @@ -52,7 +53,6 @@ CONFIG_I2C_IMX=y ## file: drivers/leds/Kconfig ## CONFIG_LEDS_GPIO=y -CONFIG_LEDS_GPIO_PLATFORM=y CONFIG_LEDS_TRIGGER_GPIO=y ## @@ -156,5 +156,6 @@ CONFIG_SND_IMX_SOC=m ## ## file: unknown ## +CONFIG_LEDS_GPIO_PLATFORM=y CONFIG_SND_SOC_IMX_SGTL5000=m diff --git a/debian/config/armhf/config.omap b/debian/config/armhf/config.omap index ab3afd4dc..e9fb4a8af 100644 --- a/debian/config/armhf/config.omap +++ b/debian/config/armhf/config.omap @@ -43,7 +43,6 @@ CONFIG_OMAP_32K_TIMER_HZ=128 CONFIG_OMAP_DM_TIMER=y CONFIG_OMAP_SERIAL_WAKE=y ## choice: OMAP PM layer selection -# CONFIG_OMAP_PM_NONE is not set CONFIG_OMAP_PM_NOOP=y ## end choice @@ -100,7 +99,6 @@ CONFIG_TOUCHSCREEN_TSC2005=m ## CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=m -CONFIG_LEDS_GPIO_PLATFORM=y CONFIG_LEDS_LP5523=m CONFIG_LEDS_TRIGGER_GPIO=m @@ -255,9 +253,6 @@ 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 @@ -332,3 +327,10 @@ CONFIG_SND_OMAP_SOC=m CONFIG_SND_OMAP_SOC_RX51=m CONFIG_SND_OMAP_SOC_SDP4430=m +## +## file: unknown +## +CONFIG_LEDS_GPIO_PLATFORM=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_USB_MUSB_OTG=y + diff --git a/debian/config/config b/debian/config/config index e5bbf7207..7d4727d4d 100644 --- a/debian/config/config +++ b/debian/config/config @@ -324,7 +324,6 @@ CONFIG_FIREWIRE_NOSY=m # CONFIG_DEBUG_GPIO is not set # CONFIG_GPIO_SYSFS is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set -# CONFIG_GPIO_BASIC_MMIO is not set # CONFIG_GPIO_IT8761E is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_VX855 is not set @@ -472,7 +471,6 @@ CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87427=m -# CONFIG_PMBUS is not set # CONFIG_SENSORS_SHT15 is not set CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SMM665=m @@ -506,6 +504,11 @@ CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_ATK0110=m +## +## file: drivers/hwmon/pmbus/Kconfig +## +# CONFIG_PMBUS is not set + ## ## file: drivers/i2c/Kconfig ## @@ -1170,7 +1173,6 @@ CONFIG_VIDEO_MEYE=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_SR030PC30=m CONFIG_VIDEO_NOON010PC30=m CONFIG_SOC_CAMERA=m @@ -1330,6 +1332,11 @@ CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_FB_IVTV=m +## +## file: drivers/media/video/marvell-ccic/Kconfig +## +CONFIG_VIDEO_CAFE_CCIC=m + ## ## file: drivers/media/video/pvrusb2/Kconfig ## @@ -2690,7 +2697,6 @@ CONFIG_ISCSI_TARGET=m ## file: drivers/target/loopback/Kconfig ## CONFIG_LOOPBACK_TARGET=m -# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set ## ## file: drivers/target/tcm_fc/Kconfig @@ -3754,7 +3760,6 @@ CONFIG_TIMER_STATS=y # CONFIG_PROVE_LOCKING is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_HIGHMEM is not set @@ -4614,7 +4619,9 @@ CONFIG_INITRAMFS_SOURCE="" ## ## file: unknown ## -# CONFIG_AUFS_HINOTIFY is not set CONFIG_CGROUP_NS=y +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_GPIO_BASIC_MMIO is not set +# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set CONFIG_SMBUS=m diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index bfcfb23d9..74ea5cb22 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -55,12 +55,9 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_CMDLINE_BOOL is not set CONFIG_PCI=y CONFIG_PCI_CNB20LE_QUIRK=y -CONFIG_DMAR=y -# CONFIG_DMAR_DEFAULT_ON is not set -CONFIG_INTR_REMAP=y +# CONFIG_RAPIDIO is not set CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=y -# CONFIG_RAPIDIO is not set ## ## file: arch/x86/Kconfig.debug @@ -611,6 +608,13 @@ CONFIG_SERIO_RAW=m ## CONFIG_INPUT_TOUCHSCREEN=y +## +## file: drivers/iommu/Kconfig +## +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_INTR_REMAP=y + ## ## file: drivers/isdn/Kconfig ## @@ -1231,7 +1235,6 @@ CONFIG_R8712U=m ## file: drivers/staging/rts_pstor/Kconfig ## CONFIG_RTS_PSTOR=m -# RTS_PSTOR_DEBUG is not set ## ## file: drivers/staging/tm6000/Kconfig @@ -1274,7 +1277,6 @@ CONFIG_PHONE_IXJ_PCMCIA=m ## file: drivers/thermal/Kconfig ## CONFIG_THERMAL=m -CONFIG_THERMAL_HWMON=y ## ## file: drivers/tty/Kconfig diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index 6df8130c5..ddbc424b7 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -139,8 +139,8 @@ CONFIG_CRYPTO_DEV_GEODE=m ## ## file: drivers/gpio/Kconfig ## -CONFIG_GPIO_CS5535=m CONFIG_GPIO_VX855=m +CONFIG_GPIO_CS5535=m ## ## file: drivers/gpu/drm/Kconfig @@ -410,11 +410,6 @@ CONFIG_COMEDI_PCMUIO=m CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m -## -## file: drivers/staging/cs5535_gpio/Kconfig -## -CONFIG_CS5535_GPIO=m - ## ## file: drivers/staging/olpc_dcon/Kconfig ## @@ -536,3 +531,8 @@ CONFIG_SND_MSND_CLASSIC=m ## CONFIG_SND_SIS7019=m +## +## file: unknown +## +CONFIG_CS5535_GPIO=m + diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index 7be5d9c91..e9d6d12b0 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -6,8 +6,6 @@ CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_CALGARY_IOMMU=y CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y -CONFIG_AMD_IOMMU=y -# CONFIG_AMD_IOMMU_STATS is not set # CONFIG_MAXSMP is not set CONFIG_NR_CPUS=512 CONFIG_NUMA=y @@ -69,6 +67,12 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y +## +## file: drivers/iommu/Kconfig +## +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_STATS is not set + ## ## file: drivers/macintosh/Kconfig ## diff --git a/debian/config/m68k/config.atari b/debian/config/m68k/config.atari index 2503469a8..e79b5e142 100644 --- a/debian/config/m68k/config.atari +++ b/debian/config/m68k/config.atari @@ -29,7 +29,6 @@ CONFIG_M68060=y CONFIG_M68KFPU_EMU=y CONFIG_M68KFPU_EMU_EXTRAPREC=y # CONFIG_M68KFPU_EMU_ONLY is not set -CONFIG_STRAM_PROC=y CONFIG_HEARTBEAT=y ## @@ -222,4 +221,5 @@ CONFIG_ATARI_ETHERNEC=m CONFIG_ATARI_ROM_ISA=y CONFIG_ATARI_SCC=y CONFIG_ATARI_SCC_DMA=y +CONFIG_STRAM_PROC=y diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 152bd7706..6784b6a8c 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -80,7 +80,6 @@ CONFIG_HZ_250=y ## end choice # CONFIG_KEXEC is not set CONFIG_PCI=y -CONFIG_VIRTUALIZATION=y ## ## file: arch/mips/Kconfig.debug @@ -1194,4 +1193,5 @@ CONFIG_SND_HDA_INTEL=m ## # CONFIG_BASLER_EXCITE is not set # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set +CONFIG_VIRTUALIZATION=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 746f703cf..779b81df3 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -83,7 +83,6 @@ CONFIG_PCI=y CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y -CONFIG_VIRTUALIZATION=y ## ## file: arch/mips/Kconfig.debug @@ -1198,4 +1197,5 @@ CONFIG_SND_HDA_INTEL=m ## # CONFIG_BASLER_EXCITE is not set # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set +CONFIG_VIRTUALIZATION=y diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 7b0b8354f..33ddbf7dd 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -13,8 +13,8 @@ CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0,9600 console=tty0" CONFIG_SECCOMP=y CONFIG_PCI=y -# CONFIG_ADVANCED_OPTIONS is not set # CONFIG_RAPIDIO is not set +# CONFIG_ADVANCED_OPTIONS is not set ## ## file: arch/powerpc/Kconfig.debug @@ -79,6 +79,7 @@ CONFIG_PROC_PREPRESIDUAL=y ## ## file: drivers/ata/Kconfig ## +CONFIG_PATA_MACIO=m CONFIG_PATA_NETCELL=m CONFIG_PATA_NS87415=m CONFIG_PATA_PDC2027X=m @@ -88,7 +89,6 @@ CONFIG_PATA_SIL680=m CONFIG_PATA_VIA=m CONFIG_PATA_NS87410=m CONFIG_PATA_PCMCIA=m -CONFIG_PATA_MACIO=m ## ## file: drivers/atm/Kconfig diff --git a/debian/config/sh4/config b/debian/config/sh4/config index 80eabc85e..71df433ef 100644 --- a/debian/config/sh4/config +++ b/debian/config/sh4/config @@ -4,7 +4,6 @@ CONFIG_SH_CPU_FREQ=y CONFIG_KEXEC=y CONFIG_SECCOMP=y -CONFIG_VIRTUALIZATION=y ## ## file: arch/sh/Kconfig.cpu @@ -54,3 +53,8 @@ CONFIG_SPARSE_IRQ=y CONFIG_PREEMPT_NONE=y ## end choice +## +## file: unknown +## +CONFIG_VIRTUALIZATION=y + diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 4e256776f..51d121102 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -303,7 +303,6 @@ CONFIG_SUNDANCE=m CONFIG_SUNDANCE_MMIO=y CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set -CONFIG_MYRI_SBUS=m CONFIG_FDDI=y CONFIG_SKFP=m # CONFIG_HIPPI is not set @@ -623,3 +622,8 @@ CONFIG_SND_SUN_AMD7930=m CONFIG_SND_SUN_CS4231=m CONFIG_SND_SUN_DBRI=m +## +## file: unknown +## +CONFIG_MYRI_SBUS=m +