The following commit has been merged in the linux branch: commit e85843a1e1974167878e6124a91a06036c3b849d Author: Florian Fainelli florian@openwrt.org Date: Mon Aug 17 00:28:24 2009 +0200

MIPS: AU1000: Fix build failure for db1x00 configured for Au1100 SoC

This patch fixes the following warning, which becomes an error due to -Werror to be turned on: CC arch/mips/alchemy/common/gpiolib-au1000.o cc1: warnings being treated as errors arch/mips/alchemy/common/gpiolib-au1000.c: In function 'au1100_gpio2_to_irq': /home/florian/dev/kernel/linux-queue/arch/mips/include/asm/mach-au1x00/gpio-au1000.h:107: warning: control reaches end of non-void function

Signed-off-by: Florian Fainelli florian@openwrt.org Signed-off-by: Ralf Baechle ralf@linux-mips.org

diff --git a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h b/arch/mips/include/asm/mach-au1x00/gpio-au1000.h index feea001..91595fa 100644 --- a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h +++ b/arch/mips/include/asm/mach-au1x00/gpio-au1000.h @@ -104,6 +104,8 @@ static inline int au1100_gpio2_to_irq(int gpio)

if ((gpio >= 8) && (gpio <= 15)) return MAKE_IRQ(0, 29); /* shared GPIO208_215 */ + + return -ENXIO; }

#ifdef CONFIG_SOC_AU1100