X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fbroadcom-diag%2Fsrc%2Fgpio.h;fp=package%2Fbroadcom-diag%2Fsrc%2Fgpio.h;h=cd48637b20ac499ba113eca7f1ae282bcb6c25bd;hp=ba539765494725d3871a75f5b3e7d6fab93b4d3c;hb=c8e962e8f9402f6fb0c1b9221e7afb6ad02cb6a8;hpb=5bbc97f2308f02c7ad79c278a89a7ee7ce27ac65

diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h
index ba5397654..cd48637b2 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 *))