Stopgap compilation fixes for diag and switch under 2.6.25

SVN-Revision: 11231

diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index e1655d0b742bbfb83100ddf4c96bf079b6c7dc2d..a1ee842f4f71951884c3d52ff6603092959a87e2 100644 (file)
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -682,7 +682,7 @@ static struct platform_t __init *platform_detect(void)
        /* Look for a model identifier */
 
        /* Based on "model_name" */
-       if (buf = nvram_get("model_name")) {
+       if ((buf = nvram_get("model_name"))) {
                if (!strcmp(buf, "DIR-130"))
                        return &platforms[DIR130];
                if (!strcmp(buf, "DIR-330"))
@@ -690,13 +690,13 @@ static struct platform_t __init *platform_detect(void)
        }
 
        /* Based on "model_no" */
-       if (buf = nvram_get("model_no")) {
+       if ((buf = nvram_get("model_no"))) {
                if (startswith(buf,"WL700")) /* WL700* */
                        return &platforms[WL700GE];
        }
 
        /* Based on "hardware_version" */
-       if (buf = nvram_get("hardware_version")) {
+       if ((buf = nvram_get("hardware_version"))) {
                if (startswith(buf,"WL500GPV2-")) /* WL500GPV2-* */
                        return &platforms[WL500GPV2];
                if (startswith(buf,"WL520GC-")) /* WL520GU-* */
@@ -706,7 +706,7 @@ static struct platform_t __init *platform_detect(void)
        }
 
        /* Based on "ModelId" */
-       if (buf = nvram_get("ModelId")) {
+       if ((buf = nvram_get("ModelId"))) {
                if (!strcmp(buf, "WR850GP"))
                        return &platforms[WR850GP];
                if (!strcmp(buf,"WX-5565"))

diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h
index 2284e9801e812c6f8a8dedab0fea43df9010a6d0..6b1b2ada4a222cedb19dd78e177941102e5a9713 100644 (file)
--- a/package/broadcom-diag/src/gpio.h
+++ b/package/broadcom-diag/src/gpio.h
@@ -5,6 +5,10 @@
 #ifndef BCMDRIVER
 #include <linux/ssb/ssb_embedded.h>
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+#include <linux/gpio.h>
+#define ssb ssb_bcm47xx
+#endif
 extern struct ssb_bus ssb;
 
 
@@ -51,11 +55,16 @@ static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *))
 {
        int irq;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+       irq = gpio_to_irq(0);
+       if (irq == -EINVAL) return;
+#else
        if (ssb.chipco.dev)
                irq = ssb_mips_irq(ssb.chipco.dev) + 2;
        else if (ssb.extif.dev)
                irq = ssb_mips_irq(ssb.extif.dev) + 2;
        else return;
+#endif
        
        if (enabled) {
                if (request_irq(irq, handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, "gpio", handler))

diff --git a/package/switch/src/gpio-bcm947xx.h b/package/switch/src/gpio-bcm947xx.h
index 9417bce2a1661f598527ba75dd81dcaaf9b786f0..9135f916a76bbdd9d38f9f47d5e95e2d17f3c38f 100644 (file)
--- a/package/switch/src/gpio-bcm947xx.h
+++ b/package/switch/src/gpio-bcm947xx.h
@@ -5,6 +5,10 @@
 #ifndef BCMDRIVER
 #include <linux/ssb/ssb_embedded.h>
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+#define ssb ssb_bcm47xx
+#endif
+
 extern struct ssb_bus ssb;