diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-01-20 13:32:57 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-01-20 13:32:57 -0500 |
commit | e8409b1dce1d927283cb4999d9902b8cda4f86fc (patch) | |
tree | aebdcb0443b56c5cee9135f08f5cf8b9678d76e6 /config-arm-imx | |
parent | 0a621ccdd414267ae3ff952951be5547f0512383 (diff) | |
download | kernel-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-imx')
-rw-r--r-- | config-arm-imx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config-arm-imx b/config-arm-imx index 2dbe10a1f..5bb963335 100644 --- a/config-arm-imx +++ b/config-arm-imx @@ -96,3 +96,9 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_PL310_ERRATA_769419=y CONFIG_LEDS_RENESAS_TPU=y + +# CONFIG_ARM_LPAE is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_INPUT_GP2A is not set +# CONFIG_INPUT_GPIO_TILT_POLLED is not set + |