diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 15:21:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 15:21:51 -0800 |
| commit | 29ac878a71d1900cc2e283819b1daa388961ab6e (patch) | |
| tree | 8756008bf1e3b07f2ab6fc6321b494a5eeee63ed /arch/arm/mm/ioremap.c | |
| parent | 54c4e6b5fee0347ab81e2c2fe4239c455c3422ae (diff) | |
| parent | a6c61e9dfdd0adf8443932cfc43b0c1e25036ad5 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mm/ioremap.c')
| -rw-r--r-- | arch/arm/mm/ioremap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 0f128c28fee..10901398e4a 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -130,8 +130,7 @@ remap_area_pages(unsigned long start, unsigned long phys_addr, * mapping. See include/asm-arm/proc-armv/pgtable.h for more information. */ void __iomem * -__ioremap(unsigned long phys_addr, size_t size, unsigned long flags, - unsigned long align) +__ioremap(unsigned long phys_addr, size_t size, unsigned long flags) { void * addr; struct vm_struct * area; |