[PATCH 2/3] UBUNTU: [Config] Disable generic USB_EHCI_HCD_PLATFORM on omap3

[Paolo Pisati]

Since we already compile-in support for platform specific code (USB_EHCI_HCD_OMAP).

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    1 +
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/armhf/config.flavour.highbank |    1 +
 debian.master/config/armhf/config.flavour.omap     |    1 +
 debian.master/config/config.common.ubuntu          |    1 -
 debian.master/config/i386/config.common.i386       |    1 +
 debian.master/config/powerpc/config.common.powerpc |    1 +
 debian.master/config/ppc64/config.common.ppc64     |    1 +
 8 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9505334a..5ceae25 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -270,6 +270,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_DWC3=m
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GPIO_VBUS=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 23324d5..d244444 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -284,6 +284,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB_ARCH_HAS_XHCI is not set
 CONFIG_USB_DWC3=m
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_GPIO_VBUS=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 301dfe5..51fa16c 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -195,6 +195,7 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_DWC3 is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GPIO_VBUS=m
 CONFIG_USB_MUSB_HDRC=m
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 44344da..85fed7c 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -195,6 +195,7 @@ CONFIG_UNUSED_SYMBOLS=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_DWC3=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_MUSB_HDRC=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index dbfa682..40c77e1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5711,7 +5711,6 @@ CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_OMAP=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_EHCI_HCD_PPC_OF=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EMI26=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 70842cd..8d04b53 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -269,6 +269,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_DWC3=m
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GPIO_VBUS=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index fe0eb23..93d3fa8 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -261,6 +261,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_DWC3=m
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GPIO_VBUS=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index be30ad3..fd0fb43 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -296,6 +296,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_DWC3=m
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GPIO_VBUS=m
-- 
1.7.9.5