aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.2/198-MIPS-BCM47XX-fix-signature-of-nvram_parse_macaddr.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-03-27 17:07:28 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-03-27 17:07:28 +0000
commita5abb0810078a982452e4a398cd7b2ccee31c28d (patch)
treeed5093337bd35fcd845ad498e3691307a277f30f /target/linux/brcm47xx/patches-3.2/198-MIPS-BCM47XX-fix-signature-of-nvram_parse_macaddr.patch
parented8902d6868d8be313179ed297a54d76f8672574 (diff)
downloadupstream-a5abb0810078a982452e4a398cd7b2ccee31c28d.tar.gz
upstream-a5abb0810078a982452e4a398cd7b2ccee31c28d.tar.bz2
upstream-a5abb0810078a982452e4a398cd7b2ccee31c28d.zip
brcm47xx: update sprom patches like they are in the mainline kernel
SVN-Revision: 31093
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/198-MIPS-BCM47XX-fix-signature-of-nvram_parse_macaddr.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.2/198-MIPS-BCM47XX-fix-signature-of-nvram_parse_macaddr.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/198-MIPS-BCM47XX-fix-signature-of-nvram_parse_macaddr.patch b/target/linux/brcm47xx/patches-3.2/198-MIPS-BCM47XX-fix-signature-of-nvram_parse_macaddr.patch
new file mode 100644
index 0000000000..ce23504416
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.2/198-MIPS-BCM47XX-fix-signature-of-nvram_parse_macaddr.patch
@@ -0,0 +1,12 @@
+
+--- a/arch/mips/include/asm/mach-bcm47xx/nvram.h
++++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h
+@@ -37,7 +37,7 @@ struct nvram_header {
+
+ extern int nvram_getenv(char *name, char *val, size_t val_len);
+
+-static inline void nvram_parse_macaddr(char *buf, u8 *macaddr)
++static inline void nvram_parse_macaddr(char *buf, u8 macaddr[6])
+ {
+ if (strchr(buf, ':'))
+ sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],