[PATCH] UBUNTU: [Config] Enable CONFIG_USB_SERIAL as a module

[Leann Ogasawara]

The following changes since commit c0f5ff1662f8782c562ac4a56f6beaab44983629:
  Andy Whitcroft (1):
        UBUNTU: Ubuntu-2.6.31-4.21

are available in the git repository at:

  git://kernel.ubuntu.com/ogasawara/ubuntu-karmic.git lp397189

Leann Ogasawara (1):
      UBUNTU: [Config] Enable CONFIG_USB_SERIAL as a module

 debian/config/amd64/config.common.amd64 |    2 +-
 debian/config/config.common.ubuntu      |    1 -
 debian/config/i386/config.common.i386   |    2 +-
 debian/config/lpia/config.common.lpia   |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

>From f826901d193360038e206f5be9f9a948786f0bdd Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara at canonical.com>
Date: Wed, 22 Jul 2009 09:30:57 -0700
Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_USB_SERIAL as a module

BugLink: http://bugs.launchpad.net/bugs/397189

Reinstate CONFIG_USB_SERIAL=m for Karmic.  This was enabled as a module
for Jaunty as is needed to reconfigure multifunction USB devices.

Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
---
 debian/config/amd64/config.common.amd64 |    2 +-
 debian/config/config.common.ubuntu      |    1 -
 debian/config/i386/config.common.i386   |    2 +-
 debian/config/lpia/config.common.lpia   |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/config/amd64/config.common.amd64 b/debian/config/amd64/config.common.amd64
index 89537a6..907d0e9 100644
--- a/debian/config/amd64/config.common.amd64
+++ b/debian/config/amd64/config.common.amd64
@@ -599,7 +599,7 @@ CONFIG_USB_RIO500=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SE401=m
-CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL=m
 CONFIG_USB_SEVSEG=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SN9C102=m
diff --git a/debian/config/config.common.ubuntu b/debian/config/config.common.ubuntu
index 04319aa..ee25e9e 100644
--- a/debian/config/config.common.ubuntu
+++ b/debian/config/config.common.ubuntu
@@ -3494,7 +3494,6 @@ CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_ATEN2011=m
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CONSOLE=y
 CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
diff --git a/debian/config/i386/config.common.i386 b/debian/config/i386/config.common.i386
index 75f34b9..69ca577 100644
--- a/debian/config/i386/config.common.i386
+++ b/debian/config/i386/config.common.i386
@@ -605,7 +605,7 @@ CONFIG_USB_RIO500=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SE401=m
-CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL=m
 CONFIG_USB_SEVSEG=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SN9C102=m
diff --git a/debian/config/lpia/config.common.lpia b/debian/config/lpia/config.common.lpia
index a57db97..ee4ae63 100644
--- a/debian/config/lpia/config.common.lpia
+++ b/debian/config/lpia/config.common.lpia
@@ -611,7 +611,7 @@ CONFIG_USB_RIO500=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SE401=m
-CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL=m
 CONFIG_USB_SEVSEG=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SN9C102=m
-- 
1.6.3.3