From e8409b1dce1d927283cb4999d9902b8cda4f86fc Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 20 Jan 2012 13:32:57 -0500 Subject: Rebase to Linux 3.3-rc1 The utrace patch is left unapplied as it doesn't apply cleanly any longer --- config-arm-kirkwood | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config-arm-kirkwood') 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 + -- cgit