summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-11-11 09:58:33 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-11-11 09:58:33 -0500
commitd74e6383768d30a8a0d0253dcdbf78ffa1a54cb5 (patch)
tree13ab81311e4468d9676841ce9016a48b4cf2ae6b
parent8985cfb689e8e0a9f43c031d3ef4e6751cf78481 (diff)
downloadkernel-d74e6383768d30a8a0d0253dcdbf78ffa1a54cb5.tar.gz
kernel-d74e6383768d30a8a0d0253dcdbf78ffa1a54cb5.tar.xz
kernel-d74e6383768d30a8a0d0253dcdbf78ffa1a54cb5.zip
Cleanup dead Kconfig symbols for 3.18-rc4
-rw-r--r--config-arm-generic1
-rw-r--r--config-armv7-generic4
-rw-r--r--config-generic12
-rw-r--r--config-x86-32-generic1
-rw-r--r--config-x86-generic1
5 files changed, 4 insertions, 15 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 188337ed8..5c4c909b7 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -71,7 +71,6 @@ CONFIG_POWER_RESET_VERSATILE=y
# CONFIG_ARM_CHARLCD is not set
# Power/Thermal/Cpufreq
-CONFIG_GENERIC_CPUFREQ_CPU0=m
# CONFIG_ARM_DT_BL_CPUFREQ is not set
# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 580cddf26..5a90b29b3 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -371,6 +371,10 @@ CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
+# Power management
+CONFIG_PM_OPP=y
+CONFIG_ARM_CPU_SUSPEND=y
+
# usb
CONFIG_USB_OHCI_HCD_PLATFORM=m
CONFIG_USB_EHCI_HCD_PLATFORM=m
diff --git a/config-generic b/config-generic
index 6c7199f48..fdd9b273b 100644
--- a/config-generic
+++ b/config-generic
@@ -706,8 +706,6 @@ CONFIG_FIREWIRE_NOSY=m
#
CONFIG_NET=y
-CONFIG_NET_DMA=y
-
CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
@@ -2759,13 +2757,8 @@ CONFIG_KXCJK1013=m
# CONFIG_AD7816 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7280 is not set
-# CONFIG_AD5930 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
-# CONFIG_AD9850 is not set
-# CONFIG_AD9852 is not set
-# CONFIG_AD9910 is not set
-# CONFIG_AD9951 is not set
# CONFIG_ADIS16060 is not set
# CONFIG_ADE7753 is not set
# CONFIG_ADE7754 is not set
@@ -3881,7 +3874,6 @@ CONFIG_USB_SERIAL_MCT_U232=m
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7715_PARPORT=y
# CONFIG_USB_SERIAL_WISHBONE is not set
-# CONFIG_USB_SERIAL_ZTE is not set
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
CONFIG_USB_SERIAL_NAVMAN=m
@@ -5030,9 +5022,6 @@ CONFIG_RTL8192E=m
# CONFIG_INPUT_GPIO is not set
# CONFIG_VIDEO_CX25821 is not set
# CONFIG_R8188EU is not set
-# Larry Finger maintains (rhbz 1113422)
-CONFIG_R8192EE=m
-# CONFIG_R8821AE is not set
# CONFIG_RTL8192U is not set
CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
# CONFIG_8723AU_AP_MODE is not set
@@ -5061,7 +5050,6 @@ CONFIG_ALTERA_STAPL=m
# CONFIG_DGNC is not set
# CONFIG_RTS5208 is not set
# CONFIG_GS_FPGABOOT is not set
-# CONFIG_BT_NOKIA_H4P is not set
# CONFIG_UNISYSSPAR is not set
# CONFIG_MEDIA_TUNER_MSI001 is not set
# END OF STAGING
diff --git a/config-x86-32-generic b/config-x86-32-generic
index a9cecb806..5daa9b8a3 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -78,7 +78,6 @@ CONFIG_X86_SPEEDSTEP_LIB=y
CONFIG_X86_LONGRUN=y
# CONFIG_X86_LONGHAUL is not set
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
# e_powersaver is dangerous
# CONFIG_X86_E_POWERSAVER is not set
diff --git a/config-x86-generic b/config-x86-generic
index c7a27d6a0..88347fede 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -491,7 +491,6 @@ CONFIG_PINCTRL_BAYTRAIL=y
# CONFIG_INTEL_POWERCLAMP is not set
CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_ACPI_INT3403_THERMAL=m
CONFIG_INTEL_SOC_DTS_THERMAL=m
CONFIG_INT340X_THERMAL=m