diff --git a/[refs] b/[refs]
index 40a21b3121f8..feacc2655dd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bd27e329ca80f4946efdd12bf1f5a9bf0886e76
+refs/heads/master: ff42d62047e45075c54a5543bd4f110dfd032d11
diff --git a/trunk/arch/mips/include/asm/mach-ar7/ar7.h b/trunk/arch/mips/include/asm/mach-ar7/ar7.h
index 7919d76186bf..31c7ff539830 100644
--- a/trunk/arch/mips/include/asm/mach-ar7/ar7.h
+++ b/trunk/arch/mips/include/asm/mach-ar7/ar7.h
@@ -202,6 +202,4 @@ static inline void ar7_device_off(u32 bit)
 
 int __init ar7_gpio_init(void);
 
-int __init ar7_gpio_init(void);
-
 #endif /* __AR7_H__ */