Jaunty config changes: Build in USB SERIAL

[Tim Gardner]

>From 75d3684405ca804d9610bf30cad071abfa0c8841 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Fri, 26 Dec 2008 14:09:59 -0700
Subject: [PATCH] UBUNTU: Build in USB SERIAL

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian/config/amd64/config              |    6 ++++--
 debian/config/i386/config               |    6 ++++--
 debian/d-i/modules/storage-core-modules |    1 -
 debian/d-i/modules/usb-modules          |    1 -
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 21aea2c..a9a9f2c 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -2635,6 +2635,7 @@ CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
+# CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@@ -3155,7 +3156,7 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_USB=m
+CONFIG_USB=y
 CONFIG_USBPCWATCHDOG=m
 CONFIG_USB_ACM=m
 CONFIG_USB_ADUTUX=m
@@ -3304,11 +3305,12 @@ CONFIG_USB_RIO500=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SE401=m
-CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_CONSOLE=y
 CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 2f38456..40d6583 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -2823,6 +2823,7 @@ CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
+# CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@@ -3394,7 +3395,7 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_USB=m
+CONFIG_USB=y
 CONFIG_USBPCWATCHDOG=m
 CONFIG_USB_ACM=m
 CONFIG_USB_ADUTUX=m
@@ -3543,11 +3544,12 @@ CONFIG_USB_RIO500=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SE401=m
-CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_CONSOLE=y
 CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
diff --git a/debian/d-i/modules/storage-core-modules b/debian/d-i/modules/storage-core-modules
index 7570921..bfce39f 100644
--- a/debian/d-i/modules/storage-core-modules
+++ b/debian/d-i/modules/storage-core-modules
@@ -1,5 +1,4 @@
 # Core stacks
-usbcore
 usb-storage
 
 # Block level
diff --git a/debian/d-i/modules/usb-modules b/debian/d-i/modules/usb-modules
index 2fb5fa3..ea062b3 100644
--- a/debian/d-i/modules/usb-modules
+++ b/debian/d-i/modules/usb-modules
@@ -7,4 +7,3 @@ sl811_cs
 sl811-hcd
 u132-hcd
 uhci-hcd
-usbserial
-- 
1.5.6.3