diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:10 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:10 -0500 |
| commit | 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd (patch) | |
| tree | ba0299694a9f3940f289b6a29cadab853906e3d2 /arch/mips/include/asm/mach-ar7/ar7.h | |
| parent | 623eb15647fc35c5a8cd38985d5958240eb072c1 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/include/asm/mach-ar7/ar7.h')
| -rw-r--r-- | arch/mips/include/asm/mach-ar7/ar7.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/include/asm/mach-ar7/ar7.h b/arch/mips/include/asm/mach-ar7/ar7.h index 7919d76186b..07d3fadb244 100644 --- 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) | |||
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | int __init ar7_gpio_init(void); | 203 | int __init ar7_gpio_init(void); |
| 204 | 204 | void __init ar7_init_clocks(void); | |
| 205 | int __init ar7_gpio_init(void); | ||
| 206 | 205 | ||
| 207 | #endif /* __AR7_H__ */ | 206 | #endif /* __AR7_H__ */ |