diff options
author | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
commit | e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61 (patch) | |
tree | 4eef5783e11357f98df2083a49b4f240e8e3830c /target/linux/brcm63xx/patches-3.10/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch | |
parent | 7c76e870395f36de61cadbd9ae4b0b7efc3dd4a7 (diff) | |
download | master-187ad058-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.gz master-187ad058-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.bz2 master-187ad058-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.zip |
brcm63xx: 3.10: backport multi-board support
There have been no reported regressions, so backport it to 3.10.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41422 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.10/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch b/target/linux/brcm63xx/patches-3.10/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch index 43709afd2e..41747da2d9 100644 --- a/target/linux/brcm63xx/patches-3.10/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch +++ b/target/linux/brcm63xx/patches-3.10/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch @@ -28,9 +28,9 @@ +int bcm63xx_ohci_register(unsigned int num_ports); #endif /* BCM63XX_DEV_USB_OHCI_H_ */ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -965,6 +965,7 @@ int __init board_register_devices(void) +--- a/arch/mips/bcm63xx/boards/board_common.c ++++ b/arch/mips/bcm63xx/boards/board_common.c +@@ -181,6 +181,7 @@ int __init board_register_devices(void) { int button_count = 0; int led_count = 0; @@ -38,8 +38,8 @@ if (board.has_uart0) bcm63xx_uart_register(0); -@@ -987,14 +988,21 @@ int __init board_register_devices(void) - !bcm63xx_nvram_get_mac_address(board.enetsw.mac_addr)) +@@ -203,14 +204,21 @@ int __init board_register_devices(void) + !board_get_mac_address(board.enetsw.mac_addr)) bcm63xx_enetsw_register(&board.enetsw); + if ((board.has_ohci0 || board.has_ehci0)) { |