Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 0f128c28fee4..10901398e4a2 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;