Merge remote branch 'alsa/fixes' into fix/hda

[sfrench/cifs-2.6.git] / arch / arm / mach-ixp4xx / include / mach / gpio.h

diff --git a/arch/arm/mach-ixp4xx/include/mach/gpio.h b/arch/arm/mach-ixp4xx/include/mach/gpio.h
index cd5aec26c072d3d218cd171ad8cb02635529ba84..a5f87ded2f28bd8e039d8c09ac04db6e8fc43d50 100644 (file)
--- a/arch/arm/mach-ixp4xx/include/mach/gpio.h
+++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h
@@ -70,7 +70,7 @@ static inline void gpio_set_value(unsigned gpio, int value)
 #include <asm-generic/gpio.h>                  /* cansleep wrappers */
 
 extern int gpio_to_irq(int gpio);
-extern int irq_to_gpio(int gpio);
+extern int irq_to_gpio(unsigned int irq);
 
 #endif