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/304-boardid_fixup.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/304-boardid_fixup.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch index 0c2fab5753..3b9e23ef7d 100644 --- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch +++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch @@ -4,7 +4,7 @@ #include <bcm63xx_dev_pcmcia.h> #include <bcm63xx_dev_spi.h> #include <board_bcm963xx.h> -+#include <bcm_tag.h> ++#include <bcm963xx_tag.h> #define PFX "board_bcm963xx: " @@ -26,10 +26,10 @@ + struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K); + + /* check if bcm_tag is at 64k offset */ -+ if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) { ++ if (strncmp(nvram.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(nvram.name, tag->board_id, BOARDID_LEN) != 0) { + /* No tag found */ + printk(KERN_DEBUG "No bcm_tag found!\n"); + return; |