summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-07-11 06:54:59 +0100
committerPeter Robinson <pbrobinson@gmail.com>2013-07-11 06:54:59 +0100
commit9e2e618269782f11df3b210eb152f028fd482d06 (patch)
tree8211bafa80aac30b23578b15ba6535cb45df1fa9 /config-armv7-generic
parentf334b4707438a8936f069c845e6a089aa9de697f (diff)
downloadkernel-9e2e618269782f11df3b210eb152f028fd482d06.tar.gz
kernel-9e2e618269782f11df3b210eb152f028fd482d06.tar.xz
kernel-9e2e618269782f11df3b210eb152f028fd482d06.zip
ARM config cleanups and changes for 3.11
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic7
1 files changed, 0 insertions, 7 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index baaf9620e..6720c64bf 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -130,13 +130,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_ARM_APPENDED_DTB=y
CONFIG_PROC_DEVICETREE=y
CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_OF_MDIO=m
-
-CONFIG_OF_DISPLAY_TIMING=y
-CONFIG_OF_VIDEOMODE=y
# General vexpress ARM drivers
CONFIG_ARM_TIMER_SP804=y
@@ -168,7 +162,6 @@ CONFIG_AX88796=m
CONFIG_AX88796_93CX6=y
CONFIG_SMC91X=m
CONFIG_SMC911X=m
-CONFIG_SMSC911X=m
CONFIG_USB_ISP1760_HCD=m
# CONFIG_USB_EHCI_HCD_ORION is not set