diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 15:09:06 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 15:09:06 -0500 |
| commit | ca869912366f60cb5e0bdd09f65e80ee6816e73c (patch) | |
| tree | a72913a29495ca078987c09fc0008f47e11b900b /include/asm-arm/arch-omap/common.h | |
| parent | dd8a306ac0c918268bd2ae89da2dea627f6e352d (diff) | |
| parent | 388f7ef720a982f49925e7b4e96f216f208f8c03 (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 */ |