diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 13:17:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 13:17:11 -0500 |
| commit | a46699c9a32505cb5bbfd16f76e7d4a2c84a7705 (patch) | |
| tree | 5c0bc91dd1c07ab95769f5749b3b58235c758d50 /include/asm-arm/arch-omap/common.h | |
| parent | 7ed0175a462c4c30f6df6fac1cccac058f997739 (diff) | |
| parent | b216c01829d0b73a468204e2e763c0a818b77a46 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-omap/common.h')
| -rw-r--r-- | include/asm-arm/arch-omap/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/common.h b/include/asm-arm/arch-omap/common.h index 2a676b4f13b5..08d58abd8218 100644 --- a/include/asm-arm/arch-omap/common.h +++ b/include/asm-arm/arch-omap/common.h | |||
| @@ -31,6 +31,6 @@ struct sys_timer; | |||
| 31 | 31 | ||
| 32 | extern void omap_map_common_io(void); | 32 | extern void omap_map_common_io(void); |
| 33 | extern struct sys_timer omap_timer; | 33 | extern struct sys_timer omap_timer; |
| 34 | extern void omap_serial_init(int ports[]); | 34 | extern void omap_serial_init(void); |
| 35 | 35 | ||
| 36 | #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ | 36 | #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ |