git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
mach-ar7
/
ar7.h
diff --git
a/arch/mips/include/asm/mach-ar7/ar7.h
b/arch/mips/include/asm/mach-ar7/ar7.h
index
7919d76
..
07d3fad
100644
(file)
--- a/
arch/mips/include/asm/mach-ar7/ar7.h
+++ b/
arch/mips/include/asm/mach-ar7/ar7.h
@@
-201,7
+201,6
@@
static inline void ar7_device_off(u32 bit)
}
int __init ar7_gpio_init(void);
-
-int __init ar7_gpio_init(void);
+void __init ar7_init_clocks(void);
#endif /* __AR7_H__ */