summaryrefslogtreecommitdiffstats
path: root/config-arm-kirkwood
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-01-20 13:32:57 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-01-20 13:32:57 -0500
commite8409b1dce1d927283cb4999d9902b8cda4f86fc (patch)
treeaebdcb0443b56c5cee9135f08f5cf8b9678d76e6 /config-arm-kirkwood
parent0a621ccdd414267ae3ff952951be5547f0512383 (diff)
downloadkernel-e8409b1dce1d927283cb4999d9902b8cda4f86fc.tar.gz
kernel-e8409b1dce1d927283cb4999d9902b8cda4f86fc.tar.xz
kernel-e8409b1dce1d927283cb4999d9902b8cda4f86fc.zip
Rebase to Linux 3.3-rc1
The utrace patch is left unapplied as it doesn't apply cleanly any longer
Diffstat (limited to 'config-arm-kirkwood')
-rw-r--r--config-arm-kirkwood4
1 files changed, 4 insertions, 0 deletions
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index 44e41f52c..a81438364 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -40,3 +40,7 @@ CONFIG_RTC_DRV_MV=m
CONFIG_MV_XOR=y
CONFIG_CRYPTO_DEV_MV_CESA=m
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+