diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 15:20:40 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 15:20:40 -0800 |
commit | cce0cac125623f9b68f25dd1350f6d616220a8dd (patch) | |
tree | 123a4dd9f040d05e42cadb6b01f301d6863b897f /include/asm-arm/arch-omap/io.h | |
parent | f564c5fe29d3fa9adc6d839714521b0554c62598 (diff) | |
parent | 18f49ea207fbcf37f81395037f0dc1cacb2aac3c (diff) | |
download | kernel_samsung_smdk4412-cce0cac125623f9b68f25dd1350f6d616220a8dd.zip kernel_samsung_smdk4412-cce0cac125623f9b68f25dd1350f6d616220a8dd.tar.gz kernel_samsung_smdk4412-cce0cac125623f9b68f25dd1350f6d616220a8dd.tar.bz2 |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Manual conflict merge of arch/arm/Kconfig
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 |