diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 | 
|---|---|---|
| committer | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 | 
| commit | b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-mmp/common.h | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
| download | olio-linux-3.10-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.xz olio-linux-3.10-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.zip  | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Diffstat (limited to 'arch/arm/mach-mmp/common.h')
| -rw-r--r-- | arch/arm/mach-mmp/common.h | 2 | 
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h index bd453274fca..0bdc50b134c 100644 --- a/arch/arm/mach-mmp/common.h +++ b/arch/arm/mach-mmp/common.h @@ -1,7 +1,5 @@  #define ARRAY_AND_SIZE(x)	(x), ARRAY_SIZE(x) -struct sys_timer; -  extern void timer_init(int irq);  extern void __init icu_init_irq(void);  |