From 9b70bfca7dea22dfac03e245571890cc1794b603 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 28 Feb 2012 00:56:12 +0100 Subject: [PATCH] --- yaml --- r: 291122 b: refs/heads/master c: ac78838b65f6e843bc04cd7772ce7c85b607a404 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/mach-bcm47xx/nvram.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 11d4eda3bd51..244045d4bf2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44d4b2ae94b19080d6d033a1f5cf2cc47443be3b +refs/heads/master: ac78838b65f6e843bc04cd7772ce7c85b607a404 diff --git a/trunk/arch/mips/include/asm/mach-bcm47xx/nvram.h b/trunk/arch/mips/include/asm/mach-bcm47xx/nvram.h index 184d5ecb5f51..69ef3efe06e7 100644 --- a/trunk/arch/mips/include/asm/mach-bcm47xx/nvram.h +++ b/trunk/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],