From: Zygo Blaxell <zblaxell@inara.furryterror.org>
Date: Sat, 12 Jan 2013 18:58:03 +0000 (-0500)
Subject: zygo: drop SGI_XP driver due to FTBFS
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cddc239ca84ba0ec9fd68775c119b516f817f2a3;p=linux

zygo: drop SGI_XP driver due to FTBFS
---

diff --git a/.config b/.config
index 2863b96ef568..744028c03e87 100644
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.13-zb64 Kernel Configuration
+# Linux/x86_64 3.2.36-zb64 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -1604,7 +1604,7 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_SGI_XP=m
+# CONFIG_SGI_XP is not set
 CONFIG_CS5535_MFGPT=m
 CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
 CONFIG_CS5535_CLOCK_EVENT_SRC=m
@@ -2956,6 +2956,7 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
@@ -4590,7 +4591,6 @@ CONFIG_USB_STORAGE_ONETOUCH=y
 CONFIG_USB_STORAGE_KARMA=y
 CONFIG_USB_STORAGE_CYPRESS_ATACB=y
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
 CONFIG_USB_LIBUSUAL=y
 
 #
@@ -5132,7 +5132,6 @@ CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
-CONFIG_R8712_AP=y
 CONFIG_RTS_PSTOR=m
 # CONFIG_RTS_PSTOR_DEBUG is not set
 CONFIG_RTS5139=m