Recent changes in ssb sprom handling break compilation. These two patches
fix the problem.

Signed-off-by: Larry Finger <[EMAIL PROTECTED]>
---

John,

These two changes should be applied to the everything branch of wireless-2.6
ASAP. Sorry about the mixup - I have no idea what happened.

Larry

Index: wireless-2.6/drivers/ssb/pci.c
===================================================================
--- wireless-2.6.orig/drivers/ssb/pci.c
+++ wireless-2.6/drivers/ssb/pci.c
@@ -415,7 +415,7 @@ static int sprom_extract(struct ssb_bus 
                if (out->revision == 0)
                        goto unsupported;
                if (out->revision >= 1 && out->revision <= 3) {
-                       sprom_extract_r123(out, in, out->revision);
+                       sprom_extract_r123(out, in);
                }
                if (out->revision == 4)
                        sprom_extract_r4(out, in);
Index: wireless-2.6/include/linux/ssb/ssb.h
===================================================================
--- wireless-2.6.orig/include/linux/ssb/ssb.h
+++ wireless-2.6/include/linux/ssb/ssb.h
@@ -16,6 +16,7 @@ struct ssb_bus;
 struct ssb_driver;
 
 struct ssb_sprom {
+       u8 revision;
        u8 il0mac[6];           /* MAC address for 802.11b/g */
        u8 et0mac[6];           /* MAC address for Ethernet */
        u8 et1mac[6];           /* MAC address for 802.11a */
_______________________________________________
Bcm43xx-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev

Reply via email to