diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /include/asm-arm/arch-ep93xx/platform.h | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'include/asm-arm/arch-ep93xx/platform.h')
| -rw-r--r-- | include/asm-arm/arch-ep93xx/platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-ep93xx/platform.h b/include/asm-arm/arch-ep93xx/platform.h index df9cbb6ef660..d7a34ce20293 100644 --- a/include/asm-arm/arch-ep93xx/platform.h +++ b/include/asm-arm/arch-ep93xx/platform.h | |||
| @@ -8,6 +8,7 @@ void ep93xx_map_io(void); | |||
| 8 | void ep93xx_init_irq(void); | 8 | void ep93xx_init_irq(void); |
| 9 | void ep93xx_init_time(unsigned long); | 9 | void ep93xx_init_time(unsigned long); |
| 10 | void ep93xx_init_devices(void); | 10 | void ep93xx_init_devices(void); |
| 11 | void ep93xx_clock_init(void); | ||
| 11 | extern struct sys_timer ep93xx_timer; | 12 | extern struct sys_timer ep93xx_timer; |
| 12 | 13 | ||
| 13 | 14 | ||