From da90872924556bce070132e353b653e3ce88aa1a Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Mon, 21 May 2012 22:17:04 -0400
Subject: Update configs for first 3.5 merge window git snapshot

---
 config-x86-32-generic | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'config-x86-32-generic')

diff --git a/config-x86-32-generic b/config-x86-32-generic
index 3fd696c64..abf9731f5 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -152,6 +152,8 @@ CONFIG_OLPC_XO1_SCI=y
 # staging
 # CONFIG_FB_OLPC_DCON is not set
 
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+
 # CONFIG_SPARSE_IRQ is not set
 
 CONFIG_RCU_FANOUT=32
@@ -205,3 +207,8 @@ CONFIG_I2O_BUS=m
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_GEOS is not set
+# CONFIG_NET5501 is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_GPIO_SODAVILLE is not set
+# CONFIG_BACKLIGHT_OT200 is not set
-- 
cgit