diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-27 13:51:31 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-27 13:51:31 -0400 |
| commit | 9db7cb6901740453a442e598563b576987dd471b (patch) | |
| tree | e38911285b5cd9980280a92ea0e0260f6c1ef2ad /arch/mips | |
| parent | 3bea8eddfebe1c61ea824dd2880d4368791edc1f (diff) | |
| parent | 03c4444650969431b3a5effde4995de767e3013a (diff) | |
| download | linux-9db7cb6901740453a442e598563b576987dd471b.tar.gz linux-9db7cb6901740453a442e598563b576987dd471b.tar.bz2 linux-9db7cb6901740453a442e598563b576987dd471b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/bcm47xx/sprom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c index a8b5408dd349..da4cdb16844e 100644 --- a/arch/mips/bcm47xx/sprom.c +++ b/arch/mips/bcm47xx/sprom.c @@ -168,6 +168,7 @@ static void nvram_read_alpha2(const char *prefix, const char *name, static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom, const char *prefix, bool fallback) { + nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback); nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback); nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback); nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback); |