From a15e1a950d88bbc5a85b0a507b89e132e8bfd79b Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 4 Feb 2013 10:19:24 +0000 Subject: bcm63xx: refresh 3.6 patches Signed-off-by: Jonas Gorski SVN-Revision: 35477 --- .../402-ehci-add-driver-for-bcm63xx-integrated-controller.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch') diff --git a/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch b/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch index 9b67b5ac8e..207e9813a0 100644 --- a/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch +++ b/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch @@ -229,7 +229,7 @@ Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller. --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1339,6 +1339,11 @@ MODULE_LICENSE ("GPL"); - #define PLATFORM_DRIVER ehci_platform_driver + #define EHCI_PLATFORM_DRIVER ehci_platform_driver #endif +#ifdef CONFIG_USB_EHCI_BCM63XX @@ -239,4 +239,4 @@ Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller. + #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \ - !defined(XILINX_OF_PLATFORM_DRIVER) + !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(EHCI_PLATFORM_DRIVER) -- cgit v1.2.3