Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
index f2f920fef10d..007bc3a03486 100644
--- a/drivers/ssb/sprom.c
+++ b/drivers/ssb/sprom.c
@@ -176,3 +176,17 @@ const struct ssb_sprom *ssb_get_fallback_sprom(void)
 {
         return fallback_sprom;
 }
+
+/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
+bool ssb_is_sprom_available(struct ssb_bus *bus)
+{
+        /* status register only exists on chipcomon rev >= 11 and we need check
+           for >= 31 only */
+        /* this routine differs from specs as we do not access SPROM directly
+           on PCMCIA */
+        if (bus->bustype == SSB_BUSTYPE_PCI &&
+            bus->chipco.dev->id.revision >= 31)
+                return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
+
+        return true;
+}