From b5695b121f1ee37b5cfc1f562c51eaccca0c311f Mon Sep 17 00:00:00 2001 From: Paolo Pisati 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 Acked-by: Leann Ogasawara Signed-off-by: Tim Gardner --- debian.master/config/amd64/config.common.amd64 | 3 +++ debian.master/config/armel/config.common.armel | 3 +++ debian.master/config/config.common.ubuntu | 4 ---- debian.master/config/i386/config.common.i386 | 3 +++ debian.master/config/powerpc/config.common.powerpc | 3 +++ debian.master/config/ppc64/config.common.ppc64 | 3 +++ 6 files changed, 15 insertions(+), 4 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.common.armel b/debian.master/config/armel/config.common.armel index 7dae2ba..a75a623 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -221,9 +221,12 @@ CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_GADGET_MUSB_HDRC=y CONFIG_USB_GSPCA_SN9C20X_EVDEV=y CONFIG_USB_G_MULTI=m +CONFIG_USB_INVENTRA_DMA=y CONFIG_USB_IP_COMMON=m # CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_MON=m +CONFIG_USB_MUSB_OMAP2PLUS=y +# CONFIG_USB_MUSB_TUSB6010 is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set # CONFIG_USB_QUICKCAM_MESSENGER is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ca6db13..143d986 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5031,7 +5031,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 @@ -5060,10 +5059,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 @@ -5196,7 +5193,6 @@ CONFIG_USB_TEST=m # CONFIG_USB_TI_CPPI_DMA is not set CONFIG_USB_TMC=m CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_TUSB_OMAP_DMA=y CONFIG_USB_U132_HCD=m CONFIG_USB_UAS=m CONFIG_USB_UEAGLEATM=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/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.10.4