diff mbox

[1/2] UBUNTU: CONFIG: compile in OTG driver and Transceiver driver

Message ID 1279895489-7195-2-git-send-email-bryan.wu@canonical.com
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Bryan Wu July 23, 2010, 2:31 p.m. UTC 
BugLink: http://bugs.launchpad.net/bugs/566645

From the dmesg.txt of the Launchpad bug, transceiver driver was missed. It will
cause the oops during the booting. So built-in them will solve this issue.

Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    3 +++
 debian.master/config/armel/config.common.armel     |    1 -
 debian.master/config/armel/config.flavour.omap     |    6 +++++-
 .../config/armel/config.flavour.versatile          |    4 ++++
 debian.master/config/config.common.ubuntu          |    3 ---
 debian.master/config/i386/config.common.i386       |    3 +++
 6 files changed, 15 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 0f25e8e..b22553d 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -150,6 +150,7 @@  CONFIG_NET_POCKET=y
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_TCPPROBE=m
 CONFIG_NFTL=m
+CONFIG_NOP_USB_XCEIV=m
 CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=64
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
@@ -223,6 +224,7 @@  CONFIG_THERMAL=y
 CONFIG_TIPC=m
 CONFIG_TTPCI_EEPROM=m
 CONFIG_TUN=y
+CONFIG_TWL4030_USB=m
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -231,6 +233,7 @@  CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_DUMMY_HCD=y
 # CONFIG_USB_GADGET_MUSB_HDRC is not set
+CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_GSPCA_SN9C20X_EVDEV is not set
 # CONFIG_USB_G_MULTI is not set
 CONFIG_USB_ISP1362_HCD=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index a40b19f..15debf0 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -89,7 +89,6 @@  CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
 CONFIG_USB_G_MULTI=m
 # CONFIG_USB_ISP1362_HCD is not set
 CONFIG_USB_MON=m
-CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_QUICKCAM_MESSENGER is not set
 # CONFIG_USB_SN9C102 is not set
 # CONFIG_USB_STV680 is not set
diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap
index fd9bcf5..7961c46 100644
--- a/debian.master/config/armel/config.flavour.omap
+++ b/debian.master/config/armel/config.flavour.omap
@@ -102,6 +102,7 @@  CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 # CONFIG_NET_SCH_INGRESS is not set
 # CONFIG_NET_TCPPROBE is not set
 CONFIG_NFTL=m
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_NO_HZ=y
 CONFIG_OC_ETM=y
 CONFIG_PARPORT=m
@@ -150,11 +151,14 @@  CONFIG_TIPC=m
 # CONFIG_TTPCI_EEPROM is not set
 CONFIG_TUN=m
 CONFIG_TWL4030_POWER=y
+CONFIG_TWL4030_USB=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 CONFIG_USB_GADGET=y
-CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_GPIO_VBUS=y
+CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OTG=y
 # CONFIG_USB_SERIAL_QUATECH2 is not set
 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile
index 269cc8f..bd6c089 100644
--- a/debian.master/config/armel/config.flavour.versatile
+++ b/debian.master/config/armel/config.flavour.versatile
@@ -102,6 +102,7 @@  CONFIG_NET_DCCPPROBE=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_TCPPROBE=m
 # CONFIG_NFTL is not set
+CONFIG_NOP_USB_XCEIV=m
 # CONFIG_NO_HZ is not set
 # CONFIG_OC_ETM is not set
 # CONFIG_PARPORT is not set
@@ -150,11 +151,14 @@  CONFIG_THERMAL=y
 CONFIG_TTPCI_EEPROM=m
 CONFIG_TUN=y
 # CONFIG_TWL4030_POWER is not set
+CONFIG_TWL4030_USB=m
 # CONFIG_UNIXWARE_DISKLABEL is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_GADGET is not set
+CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_MUSB_HDRC is not set
+CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OTG is not set
 CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_USB_SERIAL_QUATECH_USB2=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 194e437..d8a1f63 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3012,7 +3012,6 @@  CONFIG_NODES_SHIFT=6
 CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_NOP_TRACER=y
-CONFIG_NOP_USB_XCEIV=m
 CONFIG_NORTEL_HERMES=m
 CONFIG_NOZOMI=m
 CONFIG_NO_BOOTMEM=y
@@ -4365,7 +4364,6 @@  CONFIG_TULIP=m
 # CONFIG_TULIP_NAPI is not set
 CONFIG_TWL4030_CODEC=y
 CONFIG_TWL4030_CORE=y
-CONFIG_TWL4030_USB=m
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_TYPHOON=m
 # CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -4468,7 +4466,6 @@  CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GL860=m
-CONFIG_USB_GPIO_VBUS=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
 CONFIG_USB_GSPCA_CONEX=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e5c00b4..a93d6e4 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -150,6 +150,7 @@  CONFIG_NET_POCKET=y
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_TCPPROBE=m
 CONFIG_NFTL=m
+CONFIG_NOP_USB_XCEIV=m
 CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=8
 CONFIG_OUTPUT_FORMAT="elf32-i386"
@@ -224,6 +225,7 @@  CONFIG_THERMAL=y
 CONFIG_TIPC=m
 CONFIG_TTPCI_EEPROM=m
 CONFIG_TUN=y
+CONFIG_TWL4030_USB=m
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -232,6 +234,7 @@  CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_DUMMY_HCD=y
 # CONFIG_USB_GADGET_MUSB_HDRC is not set
+CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_GSPCA_SN9C20X_EVDEV is not set
 # CONFIG_USB_G_MULTI is not set
 CONFIG_USB_ISP1362_HCD=m