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-x86-32-generic | |
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-x86-32-generic')
-rw-r--r-- | config-x86-32-generic | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic index 6a9dc415f..3fd696c64 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -201,3 +201,7 @@ CONFIG_I2O_BUS=m # CONFIG_EDAC_SBRIDGE is not set # CONFIG_X86_WANT_INTEL_MID is not set +# CONFIG_OF_SELFTEST is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_INPUT_GP2A is not set +# CONFIG_INPUT_GPIO_TILT_POLLED is not set |