Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6] / arch / arm / mach-pxa / gpio.c

diff --git a/arch/arm/mach-pxa/gpio.c b/arch/arm/mach-pxa/gpio.c
index 1a7057991da67717e3103f6140dc259421f7c05d..7d3e16970be0363ae33a557fe0176de275fafe3f 100644 (file)
--- a/arch/arm/mach-pxa/gpio.c
+++ b/arch/arm/mach-pxa/gpio.c
@@ -161,9 +161,9 @@ static struct pxa_gpio_chip pxa_gpio_chip[] = {
  * Use this instead of directly setting GRER/GFER.
  */
 
-static long GPIO_IRQ_rising_edge[4];
-static long GPIO_IRQ_falling_edge[4];
-static long GPIO_IRQ_mask[4];
+static unsigned long GPIO_IRQ_rising_edge[4];
+static unsigned long GPIO_IRQ_falling_edge[4];
+static unsigned long GPIO_IRQ_mask[4];
 
 /*
  * On PXA25x and PXA27x, GAFRx and GPDRx together decide the alternate