aboutsummaryrefslogtreecommitdiffstats
path: root/package/broadcom-diag/src/gpio.h
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-02-22 17:12:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-02-22 17:12:36 +0000
commitf6148cf363b393144c54641e29c0cbf9906c6942 (patch)
treeb16199719a2283b9d474b0728de07f6f6d859cf7 /package/broadcom-diag/src/gpio.h
parentcb4bea1db2acc7be76d74be1f631571050e8008c (diff)
downloadupstream-f6148cf363b393144c54641e29c0cbf9906c6942.tar.gz
upstream-f6148cf363b393144c54641e29c0cbf9906c6942.tar.bz2
upstream-f6148cf363b393144c54641e29c0cbf9906c6942.zip
fix broadcom-diag on linux 2.6.28 (#4633)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14618 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/broadcom-diag/src/gpio.h')
-rw-r--r--package/broadcom-diag/src/gpio.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h
index ba53976549..cd48637b20 100644
--- a/package/broadcom-diag/src/gpio.h
+++ b/package/broadcom-diag/src/gpio.h
@@ -32,12 +32,10 @@ static inline u32 gpio_control(u32 mask, u32 value)
return ssb_gpio_control(&ssb, mask, value);
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-static inline u32 gpio_intmask(u32 mask, u32 value)
+static inline u32 gpio_setintmask(u32 mask, u32 value)
{
return ssb_gpio_intmask(&ssb, mask, value);
}
-#endif
static inline u32 gpio_intpolarity(u32 mask, u32 value)
{
@@ -105,7 +103,7 @@ extern spinlock_t sbh_lock;
#define gpio_out(mask, value) sb_gpioout(sbh, mask, ((value) & (mask)), GPIO_DRV_PRIORITY)
#define gpio_outen(mask, value) sb_gpioouten(sbh, mask, value, GPIO_DRV_PRIORITY)
#define gpio_control(mask, value) sb_gpiocontrol(sbh, mask, value, GPIO_DRV_PRIORITY)
-#define gpio_intmask(mask, value) sb_gpiointmask(sbh, mask, value, GPIO_DRV_PRIORITY)
+#define gpio_setintmask(mask, value) sb_gpiointmask(sbh, mask, value, GPIO_DRV_PRIORITY)
#define gpio_intpolarity(mask, value) sb_gpiointpolarity(sbh, mask, value, GPIO_DRV_PRIORITY)
static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *, struct pt_regs *))