diff options
| author | Florian Fainelli <florian@openwrt.org> | 2014-01-16 00:45:19 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2014-01-16 00:45:19 +0000 |
| commit | 07eb492643762a6174e37dee904b6b6c18292d58 (patch) | |
| tree | 63aea64aba2f266bae44d1fe1355a28d511cf482 /target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch | |
| parent | ac3caf5ea4e7a76c0b01a78b17b90e3cc7db56d6 (diff) | |
| download | upstream-07eb492643762a6174e37dee904b6b6c18292d58.tar.gz upstream-07eb492643762a6174e37dee904b6b6c18292d58.tar.bz2 upstream-07eb492643762a6174e37dee904b6b6c18292d58.zip | |
brcm63xx: do not add twice the same field to board
Changeset r39302 updated a board section and added twice .has_ehci0,
this is not necessary, so fix it.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39304 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch index 448c3a2a57..ceab4018c5 100644 --- a/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch +++ b/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch @@ -18,7 +18,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data #include <uapi/linux/bcm933xx_hcs.h> #include <uapi/linux/bcm963xx_tag.h> -@@ -968,6 +969,7 @@ int __init board_register_devices(void) +@@ -967,6 +968,7 @@ int __init board_register_devices(void) { int button_count = 0; int led_count = 0; @@ -26,7 +26,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data if (board.has_uart0) bcm63xx_uart_register(0); -@@ -1006,7 +1008,8 @@ int __init board_register_devices(void) +@@ -1005,7 +1007,8 @@ int __init board_register_devices(void) * do this after registering enet devices */ #ifdef CONFIG_SSB_PCIHOST @@ -36,7 +36,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); if (ssb_arch_register_fallback_sprom( -@@ -1053,5 +1056,9 @@ int __init board_register_devices(void) +@@ -1052,5 +1055,9 @@ int __init board_register_devices(void) platform_device_register(&bcm63xx_gpio_keys_device); } |