| Submitter | Tim Gardner |
|---|---|
| Date | Oct. 23, 2012, 2:56 p.m. |
| Message ID | <1351004197-5434-1-git-send-email-tim.gardner@canonical.com> |
| Download | mbox | patch |
| Permalink | /patch/193503/ |
| State | New |
| Headers | show |
Comments
Patch
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 23a18ff..db194af 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -246,6 +246,7 @@ CONFIG_USB_MUSB_TUSB6010=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD_PLATFORM=y +# CONFIG_USB_OTG is not set CONFIG_VFAT_FS=y CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=16 diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index e76ed0a..a7b5ba6 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -246,6 +246,7 @@ CONFIG_USB_MUSB_HDRC=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set # CONFIG_USB_OHCI_HCD_PLATFORM is not set +CONFIG_USB_OTG=y CONFIG_VFAT_FS=y # CONFIG_VGASTATE is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 58fa449..ca4e604 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -92,6 +92,7 @@ CONFIG_TWL4030_USB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set # CONFIG_USB_OHCI_HCD_PLATFORM is not set +CONFIG_USB_OTG=y CONFIG_VFAT_FS=y # CONFIG_VGASTATE is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 44b36e4..473591a 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5912,7 +5912,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF=y CONFIG_USB_OHCI_HCD_PPC_OF_BE=y CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_OMAP is not set -CONFIG_USB_OTG=y # CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_OTG_UTILS=y # CONFIG_USB_OTG_WHITELIST is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 0dd1848..d1bb7fd 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -245,6 +245,7 @@ CONFIG_USB_MUSB_TUSB6010=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD_PLATFORM=y +# CONFIG_USB_OTG is not set CONFIG_VFAT_FS=y CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=16 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 5a41232..9ee3c7e 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -239,6 +239,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set +# CONFIG_USB_OTG is not set CONFIG_VFAT_FS=m CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=16 diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index fd03351..6e5f058 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -274,6 +274,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD_PPC_OF_LE=y +# CONFIG_USB_OTG is not set CONFIG_VFAT_FS=m CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=64
BugLink: http://bugs.launchpad.net/bugs/1047527 This restores OTG behavior as it is in Precise. Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/armhf/config.common.armhf | 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 + 7 files changed, 6 insertions(+), 1 deletion(-)