summaryrefslogtreecommitdiffstats
path: root/config-x86-32-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-10-28 15:04:37 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-10-28 15:42:03 -0400
commitdff08547967b51d0c1a79626647971c508e4106e (patch)
tree40b21551bb741e71b5cddd31a6f156e660a1a23e /config-x86-32-generic
parentc813c0daaebd5c4ceeee6faea3580d9c2e50336d (diff)
downloadkernel-dff08547967b51d0c1a79626647971c508e4106e.tar.gz
kernel-dff08547967b51d0c1a79626647971c508e4106e.tar.xz
kernel-dff08547967b51d0c1a79626647971c508e4106e.zip
Linux 3.1-git2 snapshot (upstream f362f98e7c)
Diffstat (limited to 'config-x86-32-generic')
-rw-r--r--config-x86-32-generic1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 82a6f231e..566fac210 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -153,6 +153,7 @@ CONFIG_OLPC_XO1_PM=y
CONFIG_OLPC_XO15_SCI=y
CONFIG_OLPC_XO1_RTC=y
CONFIG_OLPC_XO1_SCI=y
+# CONFIG_ALIX is not set
# staging
# CONFIG_FB_OLPC_DCON is not set