diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-17 02:50:01 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-17 02:50:01 +0400 |
| commit | b94ee062b5b41c7fc0e44309e8546d4694e75007 (patch) | |
| tree | 2ba08003be8d25a573c17a00a627b424de4bb2e4 /arch/arm/mach-iop33x/include | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | 3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff) | |
| download | linux-b94ee062b5b41c7fc0e44309e8546d4694e75007.tar.xz | |
Merge branch 'depends/rmk/devel-stable' into next/boards
Diffstat (limited to 'arch/arm/mach-iop33x/include')
| -rw-r--r-- | arch/arm/mach-iop33x/include/mach/io.h | 7 | ||||
| -rw-r--r-- | arch/arm/mach-iop33x/include/mach/system.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-iop33x/include/mach/vmalloc.h | 5 |
3 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-iop33x/include/mach/io.h b/arch/arm/mach-iop33x/include/mach/io.h index 39e893e97c21..a8a66fc8fbdb 100644 --- a/arch/arm/mach-iop33x/include/mach/io.h +++ b/arch/arm/mach-iop33x/include/mach/io.h @@ -13,15 +13,8 @@ #include <asm/hardware/iop3xx.h> -extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, - unsigned int mtype); -extern void __iop3xx_iounmap(void __iomem *addr); - #define IO_SPACE_LIMIT 0xffffffff #define __io(p) ((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p)) #define __mem_pci(a) (a) -#define __arch_ioremap __iop3xx_ioremap -#define __arch_iounmap __iop3xx_iounmap - #endif diff --git a/arch/arm/mach-iop33x/include/mach/system.h b/arch/arm/mach-iop33x/include/mach/system.h index f192a34be073..86d1b20dd692 100644 --- a/arch/arm/mach-iop33x/include/mach/system.h +++ b/arch/arm/mach-iop33x/include/mach/system.h @@ -19,5 +19,5 @@ static inline void arch_reset(char mode, const char *cmd) *IOP3XX_PCSR = 0x30; /* Jump into ROM at address 0 */ - cpu_reset(0); + soft_restart(0); } diff --git a/arch/arm/mach-iop33x/include/mach/vmalloc.h b/arch/arm/mach-iop33x/include/mach/vmalloc.h deleted file mode 100644 index 48331dc23704..000000000000 --- a/arch/arm/mach-iop33x/include/mach/vmalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * arch/arm/mach-iop33x/include/mach/vmalloc.h - */ - -#define VMALLOC_END 0xfe000000UL |