summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-07 11:25:51 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-11-07 11:25:51 -0500
commitea8a97de392f5812bf340e217ae7907762c94917 (patch)
treed7d8c79e5ecf4d0502918f2825b3e2121acb0e6c /config-arm-generic
parent05e763b50e0db1ef9c00a211e3c6a92f5032190a (diff)
downloadkernel-ea8a97de392f5812bf340e217ae7907762c94917.tar.gz
kernel-ea8a97de392f5812bf340e217ae7907762c94917.tar.xz
kernel-ea8a97de392f5812bf340e217ae7907762c94917.zip
Linux 3.1-git7 (upstream 31555213f)
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 332ada620..1406e40e7 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -176,3 +176,5 @@ CONFIG_FTGMAC100=m
# CONFIG_ATM_HE is not set
# CONFIG_SCSI_ACARD is not set
# CONFIG_ARM_KPROBES_TEST is not set
+# CONFIG_PL330_DMA is not set
+# CONFIG_VIDEO_S5K6AA is not set