summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2018-04-22 14:11:51 +0100
committerPeter Robinson <pbrobinson@gmail.com>2018-04-22 14:11:51 +0100
commit1d50bf778827dcd6c27f5f5edd734e91dc01761a (patch)
treef562610ea13ca476f5236969d721858b0edaacd2
parent9aa8f0cef02ecf1f60a40d8c8a09d62d36404dab (diff)
downloadkernel-1d50bf778827dcd6c27f5f5edd734e91dc01761a.tar.gz
kernel-1d50bf778827dcd6c27f5f5edd734e91dc01761a.tar.xz
kernel-1d50bf778827dcd6c27f5f5edd734e91dc01761a.zip
Minor ARMv7 cleanups
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM89621
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl.config2
4 files changed, 3 insertions, 3 deletions
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM
new file mode 100644
index 000000000..717ba1a9f
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM
@@ -0,0 +1 @@
+CONFIG_AMX3_PM=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962
deleted file mode 100644
index f9530246c..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_WM8962=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 5fdfddff5..6eed781fd 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -171,6 +171,7 @@ CONFIG_AMD_PHY=m
# CONFIG_AMD_XGBE_DCB is not set
# CONFIG_AMD_XGBE is not set
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMX3_PM=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
@@ -5850,7 +5851,6 @@ CONFIG_SND_SOC_IMX_PCM_FIQ=m
CONFIG_SND_SOC_IMX_SGTL5000=m
CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_IMX_SSI=m
-CONFIG_SND_SOC_IMX_WM8962=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC_LPASS_CPU=m
CONFIG_SND_SOC_LPASS_PLATFORM=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5fec27c8c..ca58afccf 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -171,6 +171,7 @@ CONFIG_AMD_PHY=m
# CONFIG_AMD_XGBE_DCB is not set
# CONFIG_AMD_XGBE is not set
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMX3_PM=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
@@ -5826,7 +5827,6 @@ CONFIG_SND_SOC_IMX_PCM_FIQ=m
CONFIG_SND_SOC_IMX_SGTL5000=m
CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_IMX_SSI=m
-CONFIG_SND_SOC_IMX_WM8962=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC_LPASS_CPU=m
CONFIG_SND_SOC_LPASS_PLATFORM=m