diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /include/asm-arm/arch-omap/io.h | |
parent | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff) | |
parent | 2746b8623abce815aaae7afc946b1b39f8436f5a (diff) | |
download | kernel_samsung_tuna-70c07e02625ec46d0ffbfce1acef42d660803528.zip kernel_samsung_tuna-70c07e02625ec46d0ffbfce1acef42d660803528.tar.gz kernel_samsung_tuna-70c07e02625ec46d0ffbfce1acef42d660803528.tar.bz2 |
Merge branch 'viro'
Diffstat (limited to 'include/asm-arm/arch-omap/io.h')
-rw-r--r-- | include/asm-arm/arch-omap/io.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h index f5bcc9a..b726acf 100644 --- a/include/asm-arm/arch-omap/io.h +++ b/include/asm-arm/arch-omap/io.h @@ -116,7 +116,11 @@ typedef struct { volatile u32 offset[4096]; } __regbase32; ->offset[((vaddr)&4095)>>2] #define __REG32(paddr) __REGV32(io_p2v(paddr)) -extern void omap_map_common_io(void); +extern void omap1_map_common_io(void); +extern void omap1_init_common_hw(void); + +extern void omap2_map_common_io(void); +extern void omap2_init_common_hw(void); #else |