From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 11 Oct 2009 14:51:40 +0000 (+0000)
Subject: ssb: remove reference to missing SDIO function from last 2.6.31 ssb update
X-Git-Tag: reboot~22181
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=35ae0abbe0e2d8713a0ddcb047b253371f99b213

ssb: remove reference to missing SDIO function from last 2.6.31 ssb update

SVN-Revision: 18033
---

diff --git a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
index 8adb56d153..c3f179edb9 100644
--- a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
@@ -237,17 +237,16 @@
  	}
 --- a/drivers/ssb/scan.c
 +++ b/drivers/ssb/scan.c
-@@ -175,6 +175,9 @@ static u32 scan_read32(struct ssb_bus *b
+@@ -175,6 +175,8 @@ static u32 scan_read32(struct ssb_bus *b
  		} else
  			ssb_pcmcia_switch_segment(bus, 0);
  		break;
 +	case SSB_BUSTYPE_SDIO:
-+		offset += current_coreidx * SSB_CORE_SIZE;
-+		return ssb_sdio_scan_read32(bus, offset);
++		break;
  	}
  	return readl(bus->mmio + offset);
  }
-@@ -188,6 +191,8 @@ static int scan_switchcore(struct ssb_bu
+@@ -188,6 +190,8 @@ static int scan_switchcore(struct ssb_bu
  		return ssb_pci_switch_coreidx(bus, coreidx);
  	case SSB_BUSTYPE_PCMCIA:
  		return ssb_pcmcia_switch_coreidx(bus, coreidx);
@@ -256,7 +255,7 @@
  	}
  	return 0;
  }
-@@ -206,6 +211,8 @@ void ssb_iounmap(struct ssb_bus *bus)
+@@ -206,6 +210,8 @@ void ssb_iounmap(struct ssb_bus *bus)
  		SSB_BUG_ON(1); /* Can't reach this code. */
  #endif
  		break;
@@ -265,7 +264,7 @@
  	}
  	bus->mmio = NULL;
  	bus->mapped_device = NULL;
-@@ -230,6 +237,8 @@ static void __iomem *ssb_ioremap(struct 
+@@ -230,6 +236,8 @@ static void __iomem *ssb_ioremap(struct 
  		SSB_BUG_ON(1); /* Can't reach this code. */
  #endif
  		break;