summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-01-16 00:45:19 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-01-16 00:45:19 +0000
commit0650ce9ec4e7d72cfaee513988b4d1d15142b4a1 (patch)
treebb1cdd83a99c0bd79e8b9810ac8575fe4e4bfe4a /target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
parent053d59629742741d9309dddb441b18fd054c1a05 (diff)
downloadmtk-20170518-0650ce9ec4e7d72cfaee513988b4d1d15142b4a1.zip
mtk-20170518-0650ce9ec4e7d72cfaee513988b4d1d15142b4a1.tar.gz
mtk-20170518-0650ce9ec4e7d72cfaee513988b4d1d15142b4a1.tar.bz2
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> SVN-Revision: 39304
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.patch6
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 448c3a2..ceab401 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);
}