From 7a339bf24ba9c982fb85fa3941fa1aadb46f4d40 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Thu, 3 Dec 2009 11:20:21 +0000
Subject: [PATCH] [mips/4kc-malta, mips/5kc-malta] Compile USB as a module
 rather than into the kernel.

svn path=/dists/trunk/linux-2.6/; revision=14719
---
 debian/changelog                    |  2 ++
 debian/config/mips/config.4kc-malta | 14 +-------------
 debian/config/mips/config.5kc-malta | 14 +-------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be2fecd13..6e65d7012 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ linux-2.6 (2.6.32-1) UNRELEASED; urgency=low
   [ Martin Michlmayr ]
   * [armel/kirkwood] Turn on USB_SUSPEND (on the request of a SheevaPlug
     user).
+  * [mips/4kc-malta, mips/5kc-malta] Compile USB as a module rather than
+    into the kernel.
 
   [ Bastian Blank ]
   * Enable PCI_MSI.
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index 55e492edb..1b1ad9d71 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -259,18 +259,6 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 
-##
-## file: drivers/hid/Kconfig
-##
-CONFIG_HID=y
-
-##
-## file: drivers/hid/usbhid/Kconfig
-##
-CONFIG_USB_HID=m
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-
 ##
 ## file: drivers/hwmon/Kconfig
 ##
@@ -1171,7 +1159,7 @@ CONFIG_PHONE_IXJ=m
 ##
 ## file: drivers/usb/Kconfig
 ##
-CONFIG_USB=y
+CONFIG_USB=m
 CONFIG_USB_USS720=m
 
 ##
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index a71284f7a..cf8d0fbf5 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -251,18 +251,6 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 
-##
-## file: drivers/hid/Kconfig
-##
-CONFIG_HID=y
-
-##
-## file: drivers/hid/usbhid/Kconfig
-##
-CONFIG_USB_HID=m
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-
 ##
 ## file: drivers/hwmon/Kconfig
 ##
@@ -1394,7 +1382,7 @@ CONFIG_PHONE_IXJ=m
 ##
 ## file: drivers/usb/Kconfig
 ##
-CONFIG_USB=y
+CONFIG_USB=m
 CONFIG_USB_USS720=m
 
 ##