diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 14:09:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 14:09:29 +0100 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /arch/arm/mach-mmp/common.h | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
| download | linux-stable-054d5c9238f3c577ad51195c3ee7803613f322cc.tar.gz linux-stable-054d5c9238f3c577ad51195c3ee7803613f322cc.tar.bz2 linux-stable-054d5c9238f3c577ad51195c3ee7803613f322cc.zip | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-mmp/common.h')
| -rw-r--r-- | arch/arm/mach-mmp/common.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h index b4a0ba05a0f4..ec8d65ded25c 100644 --- a/arch/arm/mach-mmp/common.h +++ b/arch/arm/mach-mmp/common.h @@ -3,15 +3,6 @@ struct sys_timer; extern void timer_init(int irq); -extern void mmp2_clear_pmic_int(void); - -extern struct sys_timer pxa168_timer; -extern struct sys_timer pxa910_timer; -extern struct sys_timer mmp2_timer; -extern void __init pxa168_init_irq(void); -extern void __init pxa910_init_irq(void); -extern void __init mmp2_init_icu(void); -extern void __init mmp2_init_irq(void); extern void __init icu_init_irq(void); -extern void __init pxa_map_io(void); +extern void __init mmp_map_io(void); |