From c9862d531ab5290351681eaa3c5176786bc51612 Mon Sep 17 00:00:00 2001
From: Paolo Pisati <paolo.pisati@canonical.com>
Date: Wed, 13 Apr 2011 17:20:11 +0200
Subject: [PATCH] UBUNTU: [Config] s/USB_MUSB_TUSB6010/USB_MUSB_OMAP2PLUS/ on omap3 to get musb

BugLink: https://bugs.launchpad.net/ubuntu/+bug/759913

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    3 +++
 debian.master/config/armel/config.flavour.omap     |    3 +++
 .../config/armel/config.flavour.versatile          |    3 +++
 debian.master/config/config.common.ubuntu          |    3 ---
 debian.master/config/i386/config.common.i386       |    3 +++
 debian.master/config/i386/config.flavour.generic   |    3 +++
 debian.master/config/powerpc/config.common.powerpc |    3 +++
 debian.master/config/ppc64/config.common.ppc64     |    3 +++
 8 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index f66d05c..8f192a2 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -369,9 +369,12 @@ CONFIG_USB_GADGET_DUMMY_HCD=y
 CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_GSPCA_SN9C20X_EVDEV is not set
 # CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_INVENTRA_DMA is not set
 CONFIG_USB_IP_COMMON=m
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_MON=y
+# CONFIG_USB_MUSB_OMAP2PLUS is not set
+CONFIG_USB_MUSB_TUSB6010=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=y
diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap
index 8fcc1b5..59735e6 100644
--- a/debian.master/config/armel/config.flavour.omap
+++ b/debian.master/config/armel/config.flavour.omap
@@ -143,7 +143,10 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_GPIO_VBUS=y
+CONFIG_USB_INVENTRA_DMA=y
 CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+# CONFIG_USB_MUSB_TUSB6010 is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OTG=y
 # CONFIG_USB_SERIAL_QUATECH2 is not set
diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile
index cdf5e0b..7c54238 100644
--- a/debian.master/config/armel/config.flavour.versatile
+++ b/debian.master/config/armel/config.flavour.versatile
@@ -143,7 +143,10 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_GADGET is not set
 CONFIG_USB_GPIO_VBUS=m
+# CONFIG_USB_INVENTRA_DMA is not set
 # CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MUSB_OMAP2PLUS is not set
+CONFIG_USB_MUSB_TUSB6010=y
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OTG is not set
 CONFIG_USB_SERIAL_QUATECH2=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8f0bdc3..6e02a14 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5030,7 +5030,6 @@ CONFIG_USB_HIDDEV=y
 CONFIG_USB_HSO=m
 CONFIG_USB_HWA_HCD=m
 CONFIG_USB_IDMOUSE=m
-# CONFIG_USB_INVENTRA_DMA is not set
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_IPHETH=m
 # CONFIG_USB_IP_DEBUG_ENABLE is not set
@@ -5059,10 +5058,8 @@ CONFIG_USB_MR800=m
 # CONFIG_USB_MUSB_DEBUG is not set
 CONFIG_USB_MUSB_HDRC_HCD=y
 # CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_OMAP2PLUS is not set
 CONFIG_USB_MUSB_OTG=y
 # CONFIG_USB_MUSB_PERIPHERAL is not set
-CONFIG_USB_MUSB_TUSB6010=y
 CONFIG_USB_NET2280=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 124ced8..f5f5fb5 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -368,9 +368,12 @@ CONFIG_USB_GADGET_DUMMY_HCD=y
 CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_GSPCA_SN9C20X_EVDEV is not set
 # CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_INVENTRA_DMA is not set
 CONFIG_USB_IP_COMMON=m
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_MON=y
+# CONFIG_USB_MUSB_OMAP2PLUS is not set
+CONFIG_USB_MUSB_TUSB6010=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=y
diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
index b282bda..c7eb872 100644
--- a/debian.master/config/i386/config.flavour.generic
+++ b/debian.master/config/i386/config.flavour.generic
@@ -19,4 +19,7 @@ CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_RING=m
+# CONFIG_XEN_BLKDEV_FRONTEND is UNMERGABLE
+# CONFIG_XEN_NETDEV_FRONTEND is UNMERGABLE
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
+# CONFIG_XEN_XENBUS_FRONTEND is UNMERGABLE
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 8b71b6f..66398af 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -347,9 +347,12 @@ CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_INVENTRA_DMA is not set
 # CONFIG_USB_IP_COMMON is not set
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_MON=y
+# CONFIG_USB_MUSB_OMAP2PLUS is not set
+CONFIG_USB_MUSB_TUSB6010=y
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_HCD=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 13d506e..e55a6d4 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -388,9 +388,12 @@ CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_GADGET_NET2280=y
 CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_INVENTRA_DMA is not set
 # CONFIG_USB_IP_COMMON is not set
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_MON=y
+# CONFIG_USB_MUSB_OMAP2PLUS is not set
+CONFIG_USB_MUSB_TUSB6010=y
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_HCD=y
-- 
1.7.1

