1 files changed, 8 insertions, 2 deletions

diff --git a/arch/m68k/include/asm/gpio.h b/arch/m68k/include/asm/gpio.h
index 530862207ecf..4395ffc51fdb 100644
--- a/arch/m68k/include/asm/gpio.h
+++ b/arch/m68k/include/asm/gpio.h
@@ -64,8 +64,14 @@ static inline void gpio_set_value(unsigned gpio, int value)
 
 static inline int gpio_to_irq(unsigned gpio)
 {
-        return (gpio < MCFGPIO_IRQ_MAX) ? gpio + MCFGPIO_IRQ_VECBASE
-                : __gpio_to_irq(gpio);
+#if defined(MCFGPIO_IRQ_MIN)
+        if ((gpio >= MCFGPIO_IRQ_MIN) && (gpio < MCFGPIO_IRQ_MAX))
+#else
+        if (gpio < MCFGPIO_IRQ_MAX)
+#endif
+                return gpio + MCFGPIO_IRQ_VECBASE;
+        else
+                return __gpio_to_irq(gpio);
 }
 
 static inline int irq_to_gpio(unsigned irq)