diff options
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index 8f3362a87..0212ee680 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm47xx BOARDNAME:=Broadcom BCM947xx/953xx FEATURES:=squashfs usb pcmcia -LINUX_VERSION:=3.0.17 +LINUX_VERSION:=3.0.18 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram diff --git a/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch b/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch index 4837fe740..0a329c00a 100644 --- a/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch +++ b/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch @@ -11,7 +11,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c -@@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_ +@@ -74,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_ u32 tmp; /* We do only have one cardbus device behind the bridge. */ @@ -19,4 +19,4 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> + if (pc->cardbusmode && (dev > 1)) goto out; - /* Type 0 transaction */ + if (bus == 0) { |