From 5d70571c3911d904d2b6b51f10bf6541c4dbcddb Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 4 Dec 2009 17:29:29 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/kernelarch-x86/config, debian/config/powerpc/config, debian/config/sparc/config: Set USB to module. * debian/config/kernelarch-x86/config-arch-32, debian/config/kernelarch-x86/config-arch-64: Remove USB. svn path=/dists/trunk/linux-2.6/; revision=14732 --- debian/changelog | 1 + debian/config/kernelarch-x86/config | 1 + debian/config/kernelarch-x86/config-arch-32 | 5 ----- debian/config/kernelarch-x86/config-arch-64 | 5 ----- debian/config/powerpc/config | 2 +- debian/config/sparc/config | 2 +- 6 files changed, 4 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 571273c50..4f0f742bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ linux-2.6 (2.6.32-1) UNRELEASED; urgency=low * Use python-support instead of python-central. * Always enable software watchdog support. * Always enable complete USB mass storage support. + * [amd64, powerpc, sparc] Build USB support as module. [ Ben Hutchings ] * Re-enable accidentally omitted drivers, thanks to Uwe Kleine-König diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index ec7f40ba1..7bfcd7d68 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1114,6 +1114,7 @@ CONFIG_THERMAL_HWMON=y ## ## file: drivers/usb/Kconfig ## +CONFIG_USB=m CONFIG_USB_USS720=m ## diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index e0d722ba9..54dcb1fd6 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -392,11 +392,6 @@ CONFIG_PCMCIA_NINJA_SCSI=m ## CONFIG_SERIAL_8250_EXAR_ST16C554=m -## -## file: drivers/usb/Kconfig -## -CONFIG_USB=m - ## ## file: drivers/video/Kconfig ## diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index c7624a6bf..e744bf53b 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -106,11 +106,6 @@ CONFIG_MAC_EMUMOUSEBTN=y ## CONFIG_SCSI_INIA100=m -## -## file: drivers/usb/Kconfig -## -CONFIG_USB=y - ## ## file: drivers/video/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index b8821a0b0..ca64e797d 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -719,7 +719,7 @@ CONFIG_PHONE_IXJ_PCMCIA=m ## ## file: drivers/usb/Kconfig ## -CONFIG_USB=y +CONFIG_USB=m ## ## file: drivers/usb/atm/Kconfig diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 0d31e4605..4173fa09e 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -418,7 +418,7 @@ CONFIG_SERIAL_JSM=m ## ## file: drivers/usb/Kconfig ## -CONFIG_USB=y +CONFIG_USB=m # CONFIG_USB_USS720 is not set ##