summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-04-22 12:44:26 +0100
committerPeter Robinson <pbrobinson@gmail.com>2013-04-22 12:44:26 +0100
commit301a410406ad285cc2cfcb3673c4f6b7f6f2dca4 (patch)
tree7db213536047f2742d388148f4eb83ff6922e8a4 /config-armv7
parent05d0705489ba7bbe8a5daa86d924eef5ebbc64c4 (diff)
downloadkernel-301a410406ad285cc2cfcb3673c4f6b7f6f2dca4.tar.gz
kernel-301a410406ad285cc2cfcb3673c4f6b7f6f2dca4.tar.xz
kernel-301a410406ad285cc2cfcb3673c4f6b7f6f2dca4.zip
Minor ARM updates
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv76
1 files changed, 1 insertions, 5 deletions
diff --git a/config-armv7 b/config-armv7
index 6e34dec47..4f27e5c06 100644
--- a/config-armv7
+++ b/config-armv7
@@ -61,12 +61,9 @@ CONFIG_PINCTRL_ARMADA_370=y
CONFIG_PINCTRL_ARMADA_XP=y
CONFIG_PINCTRL_DOVE=y
CONFIG_EDAC_MV64X60=m
-CONFIG_SATA_MV=m
-CONFIG_MARVELL_PHY=m
-CONFIG_RTC_DRV_S35390A=y
+CONFIG_RTC_DRV_S35390A=m
CONFIG_RTC_DRV_88PM80X=m
CONFIG_RTC_DRV_MV=m
-CONFIG_MVMDIO=m
CONFIG_MVNETA=m
CONFIG_GPIO_MVEBU=y
CONFIG_MVEBU_CLK_CORE=y
@@ -450,7 +447,6 @@ CONFIG_REGULATOR_LP8755=m
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
# CONFIG_ARM_KPROBES_TEST is not set
-# CONFIG_LEDS_PWM is not set
# Defined config options we don't use yet
# CONFIG_PINCTRL_IMX35 is not set