aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.7/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-02-15 12:23:49 +0000
committerJonas Gorski <jogo@openwrt.org>2013-02-15 12:23:49 +0000
commit485e52e1d8325c433ee6351a441dc2dd70948814 (patch)
treecc6e883e2ff09bff0dddbc7de468a93a6c975632 /target/linux/brcm63xx/patches-3.7/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
parent162b8e23a5b6ddc158bd382cbd8ae8b31cac9082 (diff)
downloadupstream-485e52e1d8325c433ee6351a441dc2dd70948814.tar.gz
upstream-485e52e1d8325c433ee6351a441dc2dd70948814.tar.bz2
upstream-485e52e1d8325c433ee6351a441dc2dd70948814.zip
bcm63xx: make nvram checksum failures non fatal
fixes #12982. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 35605
Diffstat (limited to 'target/linux/brcm63xx/patches-3.7/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.7/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.7/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.7/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
index 71f3a14ec7..033a8a50c4 100644
--- a/target/linux/brcm63xx/patches-3.7/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
+++ b/target/linux/brcm63xx/patches-3.7/432-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/bcm963xx_tag.h>
-@@ -910,6 +911,7 @@ int __init board_register_devices(void)
+@@ -907,6 +908,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);
-@@ -948,7 +950,8 @@ int __init board_register_devices(void)
+@@ -945,7 +947,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(
-@@ -990,5 +993,9 @@ int __init board_register_devices(void)
+@@ -987,5 +990,9 @@ int __init board_register_devices(void)
platform_device_register(&bcm63xx_gpio_keys_device);
}