diff options
| author | Olof Johansson | 2011-12-19 21:12:47 -0800 |
|---|---|---|
| committer | Olof Johansson | 2011-12-19 21:12:53 -0800 |
| commit | 4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (patch) | |
| tree | 0ac643f1a0c57a88452ef017c61d325fab98d00a /arch/arm/mach-orion5x/include | |
| parent | f68453e076dcf140c4a7bdd385f239b1e41be983 (diff) | |
| parent | 1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b (diff) | |
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit)
ARM: picoxcell: implement watchdog restart
Diffstat (limited to 'arch/arm/mach-orion5x/include')
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/io.h | 25 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/vmalloc.h | 5 |
2 files changed, 0 insertions, 30 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/io.h b/arch/arm/mach-orion5x/include/mach/io.h index c5196101a237..e9d9afdc2659 100644 --- a/arch/arm/mach-orion5x/include/mach/io.h +++ b/arch/arm/mach-orion5x/include/mach/io.h @@ -15,31 +15,6 @@ #define IO_SPACE_LIMIT 0xffffffff -static inline void __iomem * -__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype) -{ - void __iomem *retval; - unsigned long offs = paddr - ORION5X_REGS_PHYS_BASE; - if (mtype == MT_DEVICE && size && offs < ORION5X_REGS_SIZE && - size <= ORION5X_REGS_SIZE && offs + size <= ORION5X_REGS_SIZE) { - retval = (void __iomem *)ORION5X_REGS_VIRT_BASE + offs; - } else { - retval = __arm_ioremap(paddr, size, mtype); - } - - return retval; -} - -static inline void -__arch_iounmap(void __iomem *addr) -{ - if (addr < (void __iomem *)ORION5X_REGS_VIRT_BASE || - addr >= (void __iomem *)(ORION5X_REGS_VIRT_BASE + ORION5X_REGS_SIZE)) - __iounmap(addr); -} - -#define __arch_ioremap __arch_ioremap -#define __arch_iounmap __arch_iounmap #define __io(a) __typesafe_io(a) #define __mem_pci(a) (a) diff --git a/arch/arm/mach-orion5x/include/mach/vmalloc.h b/arch/arm/mach-orion5x/include/mach/vmalloc.h deleted file mode 100644 index 06b50aeff7b9..000000000000 --- a/arch/arm/mach-orion5x/include/mach/vmalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * arch/arm/mach-orion5x/include/mach/vmalloc.h - */ - -#define VMALLOC_END 0xfd800000UL |