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-armv7-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-armv7-generic')
| -rw-r--r-- | config-armv7-generic | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index 72ae5b280..99c81a7f2 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -95,7 +95,6 @@ CONFIG_PJ4B_ERRATA_4742=y # CONFIG_ARM_ERRATA_798181 is not set # generic that deviates from or should be merged into config-generic -CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_HIGHMEM=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -116,16 +115,8 @@ CONFIG_RCU_FANOUT=32 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_LSM_MMAP_MIN_ADDR=32768 -CONFIG_SECCOMP=y -CONFIG_STRICT_DEVMEM=y - CONFIG_XZ_DEC_ARM=y -CONFIG_OC_ETM=y -CONFIG_PM=y -CONFIG_PM_STD_PARTITION="" -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set -CONFIG_SUSPEND=y CONFIG_ARM_CPU_SUSPEND=y CONFIG_LOCAL_TIMERS=y |