summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-05-10 21:59:43 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-05-10 21:59:43 +0100
commit5f0cb5e84b3a666943f3555abcbf7b8397bf9a17 (patch)
tree96e3fce8e5a95966bad2de0be73624e38ba2af00 /config-generic
parent3db76a27439c589263d389b816f560bc1badc6b4 (diff)
downloadkernel-5f0cb5e84b3a666943f3555abcbf7b8397bf9a17.tar.gz
kernel-5f0cb5e84b3a666943f3555abcbf7b8397bf9a17.tar.xz
kernel-5f0cb5e84b3a666943f3555abcbf7b8397bf9a17.zip
Enable Marvell Dove support, minor ARM cleanups
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 0 insertions, 3 deletions
diff --git a/config-generic b/config-generic
index a3b0ca7d0..ba9a538d8 100644
--- a/config-generic
+++ b/config-generic
@@ -2717,7 +2717,6 @@ CONFIG_W1_CON=y
CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS1WM=m
-# CONFIG_HDQ_MASTER_OMAP is not set
CONFIG_W1_SLAVE_THERM=m
CONFIG_W1_SLAVE_SMEM=m
CONFIG_W1_SLAVE_DS2408=m
@@ -4600,7 +4599,6 @@ CONFIG_INOTIFY_USER=y
#
# Bus devices
#
-# CONFIG_OMAP_OCP2SCP is not set
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
@@ -4935,7 +4933,6 @@ CONFIG_STAGING_MEDIA=y
# CONFIG_VIDEO_GO7007 is not set
# CONFIG_I2C_BCM2048 is not set
# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_OMAP4 is not set
# CONFIG_USB_MSI3101 is not set
# CONFIG_DT3155 is not set
# CONFIG_W35UND is not set