summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/files/arch
diff options
context:
space:
mode:
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-02-19 16:50:12 +0000
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-02-19 16:50:12 +0000
commitcb3d8ef339db95b33120437668a4707ca4c13fc3 (patch)
treea7773c01b98e0d97bb69ee334c181f55ee7b389b /target/linux/brcm47xx/files/arch
parent84296b55ed91435826d4c305d1f87c9e06566743 (diff)
ssb: Fix the horrible crash of innocent cardbus cards.
No Animals were harmed in the production of this patch. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10497 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/files/arch')
-rw-r--r--target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
index 2c106c9b2..85ff1cf81 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
+++ b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
@@ -158,6 +158,9 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariant
bcm47xx_fill_sprom(&iv->sprom);
+ if ((s = nvram_get("cardbus")))
+ iv->has_cardbus_slot = !!simple_strtoul(s, NULL, 10);
+
return 0;
}