summaryrefslogtreecommitdiffstats
path: root/config-arm-kirkwood
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2011-12-23 10:28:07 -0600
committerDennis Gilmore <dennis@ausil.us>2011-12-23 10:28:48 -0600
commit1cbcbe6c389c712d7368ba171bd0b00fe8e32819 (patch)
tree1ada80657844e6afa7e08fbf12f0bb23f6c88b82 /config-arm-kirkwood
parent534352f358b444bf67c24181516d90d4ca59ed46 (diff)
downloadkernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.tar.gz
kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.tar.xz
kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.zip
pull in the arm config changes from f15
Diffstat (limited to 'config-arm-kirkwood')
-rw-r--r--config-arm-kirkwood2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index 6aa045cd9..415e822dc 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -40,4 +40,4 @@ CONFIG_RTC_DRV_MV=m
CONFIG_MV_XOR=y
CONFIG_CRYPTO_DEV_MV_CESA=m
-
+# CONFIG_TOUCHSCREEN_EETI is not set