diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-08-16 16:13:34 +0100 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-08-19 09:37:57 -0400 |
| commit | 09ffc5546cb375d5ea3623ce29d937031fd322d0 (patch) | |
| tree | 30f7d5f5849ca2b7fdd2b7e37f17f2a814e869ce /config-generic | |
| parent | cb5174043f2b39590be63b76c530a15a7c9e1fa0 (diff) | |
| download | kernel-09ffc5546cb375d5ea3623ce29d937031fd322d0.tar.gz kernel-09ffc5546cb375d5ea3623ce29d937031fd322d0.tar.xz kernel-09ffc5546cb375d5ea3623ce29d937031fd322d0.zip | |
Minor kernel configs cleanup merging duplicated config opts into generic
Merge config changes from the various arch configs into generic-config where there's overlapping identical configs across all architectures. If there's a single arch that is difference to the rest of the architectures that option remains in the arch specific config as it takes precedence over the generic config.
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 786cd83f9..aa1613188 100644 --- a/config-generic +++ b/config-generic @@ -103,6 +103,8 @@ CONFIG_PCIEAER_INJECT=m CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_HOTPLUG_PCI_FAKE=m +# CONFIG_SGI_IOC4 is not set + # CONFIG_ISA is not set # CONFIG_SCx200 is not set @@ -304,6 +306,7 @@ CONFIG_BLK_CPQ_DA=m CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=m +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_UMEM=m CONFIG_BLK_DEV_LOOP=m @@ -1225,6 +1228,8 @@ CONFIG_L2TP_ETH=m CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=y +CONFIG_ETHERNET=y + # # Ethernet (10 or 100Mbit) # @@ -4095,6 +4100,9 @@ CONFIG_AUDITSYSCALL=y # http://lists.fedoraproject.org/pipermail/kernel/2013-February/004125.html CONFIG_AUDIT_LOGINUID_IMMUTABLE=y +CONFIG_SECCOMP=y +CONFIG_STRICT_DEVMEM=y + # CONFIG_SSBI is not set # @@ -4281,6 +4289,8 @@ CONFIG_PROC_EVENTS=y CONFIG_IBMASR=m +CONFIG_PM=y +CONFIG_PM_STD_PARTITION="" CONFIG_PM_DEBUG=y CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y @@ -4289,6 +4299,9 @@ CONFIG_PM_RUNTIME=y # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set +CONFIG_HIBERNATION=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_SUSPEND=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y @@ -4431,8 +4444,12 @@ CONFIG_JUMP_LABEL=y CONFIG_OPTPROBES=y CONFIG_HZ_1000=y +CONFIG_NO_HZ=y CONFIG_TIMER_STATS=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PERF_EVENTS=y +CONFIG_PERF_COUNTERS=y # Auxillary displays CONFIG_KS0108=m |