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-powerpc-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-powerpc-generic')
| -rw-r--r-- | config-powerpc-generic | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/config-powerpc-generic b/config-powerpc-generic index 04af6af2..2f26fb4b 100644 --- a/config-powerpc-generic +++ b/config-powerpc-generic @@ -1,5 +1,4 @@ # Most PowerPC kernels we build are SMP -CONFIG_SMP=y CONFIG_IRQ_ALL_CPUS=y CONFIG_PPC=y CONFIG_WATCHDOG_RTAS=m @@ -11,14 +10,6 @@ CONFIG_TAU=y # CONFIG_TAU_INT is not set CONFIG_TAU_AVERAGE=y -CONFIG_SECCOMP=y - -CONFIG_PM=y -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set -CONFIG_PM_STD_PARTITION="" - -CONFIG_SUSPEND=y -CONFIG_HIBERNATION=y # CONFIG_RTC is not set # CONFIG_GEN_RTC is not set # CONFIG_GEN_RTC_X is not set @@ -100,9 +91,6 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_GPIO=m -# FIXME: Should depend on IA64/x86 -# CONFIG_SGI_IOC4 is not set - CONFIG_PPC_EFIKA=y CONFIG_PPC_MEDIA5200=y @@ -363,7 +351,6 @@ CONFIG_RFKILL_GPIO=m # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_INPUT_GP2A is not set # CONFIG_INPUT_GPIO_TILT_POLLED is not set -CONFIG_STRICT_DEVMEM=y CONFIG_RCU_FANOUT_LEAF=16 @@ -371,7 +358,6 @@ CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_MPIC_MSGR is not set # CONFIG_FA_DUMP is not set # CONFIG_MDIO_BUS_MUX_GPIO is not set -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_FAIL_IOMMU is not set # CONFIG_SPAPR_TCE_IOMMU is not set |