diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-14 11:23:15 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-14 13:34:05 -0500 |
commit | ec0fd9d87484200e995dfabc0b476293a5942018 (patch) | |
tree | dbf879c95199a3bfccfe29b51768012b10460003 /config-generic | |
parent | dba6fdeb99132b812a2bef6438ea0d7b2f06dd25 (diff) | |
download | kernel-ec0fd9d87484200e995dfabc0b476293a5942018.tar.gz kernel-ec0fd9d87484200e995dfabc0b476293a5942018.tar.xz kernel-ec0fd9d87484200e995dfabc0b476293a5942018.zip |
Linux v3.12-8333-g4fbf888
- Build tmon in kernel-tools
- Disable ARM NEON optimised AES and OMAP2PLUS cpufreq because they don't build
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config-generic b/config-generic index f80c276e1..c791e0a92 100644 --- a/config-generic +++ b/config-generic @@ -309,6 +309,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m # Block devices # CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m # CONFIG_PARIDE is not set @@ -325,6 +326,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_SKD=m # 64-bit only but easier to put here CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 @@ -4508,6 +4510,7 @@ CONFIG_IBMASR=m CONFIG_PM=y CONFIG_PM_STD_PARTITION="" CONFIG_PM_DEBUG=y +# CONFIG_DPM_WATCHDOG is not set # revisit this in debug CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y CONFIG_PM_TEST_SUSPEND=y @@ -5078,6 +5081,8 @@ CONFIG_FMC_TRIVIAL=m CONFIG_FMC_WRITE_EEPROM=m CONFIG_FMC_CHARDEV=m +# CONFIG_POWERCAP is not set + # CONFIG_HSI is not set # CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set |