diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:05 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:05 +0900 |
| commit | ef4ed97d6bd91aa41907181e80a7feaf2721719a (patch) | |
| tree | adc44e858c150c41ebf1dd7c6ee2f6bcbac75502 /arch/sh/include/asm/io_generic.h | |
| parent | Merge branch 'sh/clkfwk' (diff) | |
| parent | sh: Ensure active regions have a backing PMB entry. (diff) | |
| download | linux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.tar.xz linux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.zip | |
Merge branch 'sh/lmb'
Conflicts:
arch/sh/kernel/setup.c
Diffstat (limited to 'arch/sh/include/asm/io_generic.h')
| -rw-r--r-- | arch/sh/include/asm/io_generic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/asm/io_generic.h b/arch/sh/include/asm/io_generic.h index 1e5d375f55dc..491df93cbf8e 100644 --- a/arch/sh/include/asm/io_generic.h +++ b/arch/sh/include/asm/io_generic.h @@ -38,5 +38,6 @@ void IO_CONCAT(__IO_PREFIX,iounmap)(void *addr); void __iomem *IO_CONCAT(__IO_PREFIX,ioport_map)(unsigned long addr, unsigned int size); void IO_CONCAT(__IO_PREFIX,ioport_unmap)(void __iomem *addr); +void IO_CONCAT(__IO_PREFIX,mem_init)(void); #undef __IO_PREFIX |