diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-10-09 08:08:49 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-10-09 08:08:49 +0000 |
| commit | cb4f3079ccf2056fce0f78050c3af1e66079b926 (patch) | |
| tree | 93041de6f3b70dce7d2407a11231a35fd8e3d8ce /target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch | |
| parent | 5ea49bbb0e9d32ba629161a4ef670522ab95397f (diff) | |
| download | upstream-cb4f3079ccf2056fce0f78050c3af1e66079b926.tar.gz upstream-cb4f3079ccf2056fce0f78050c3af1e66079b926.tar.bz2 upstream-cb4f3079ccf2056fce0f78050c3af1e66079b926.zip | |
bcm63xx: remove bcm_tag usage in kernel
Fixes #12292.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33670 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch b/target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch index ff2a831d84..8ebbdb7374 100644 --- a/target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch +++ b/target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch @@ -91,12 +91,12 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> + char *board_name = (char *)bcm63xx_nvram_get_name(); /* check if bcm_tag is at 64k offset */ -- if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) { -+ if (strncmp(board_name, tag->boardid, BOARDID_LEN) != 0) { +- if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) { ++ if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) { /* else try 128k */ tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K); -- if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) { -+ if (strncmp(board_name, tag->boardid, BOARDID_LEN) != 0) { +- if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) { ++ if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) { /* No tag found */ printk(KERN_DEBUG "No bcm_tag found!\n"); return; |