From f027ecb2cf9b1a1c6cab6f5e4a9d99c49bced63c Mon Sep 17 00:00:00 2001 From: Peter Denison Date: Tue, 20 May 2008 22:33:45 +0000 Subject: Stopgap compilation fixes for diag and switch under 2.6.25 SVN-Revision: 11231 --- package/broadcom-diag/src/gpio.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'package/broadcom-diag/src/gpio.h') diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h index 2284e9801e..6b1b2ada4a 100644 --- a/package/broadcom-diag/src/gpio.h +++ b/package/broadcom-diag/src/gpio.h @@ -5,6 +5,10 @@ #ifndef BCMDRIVER #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) +#include +#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)) -- cgit v1.2.3