Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 674c0453 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] 3/4: Remove asm/hardware.h from SA1100 io.h 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c6b8fdad

arch/arm/mm/ioremap.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/vmalloc.h>



#include <asm/cacheflush.h>

#include <asm/hardware.h>

#include <asm/io.h>

#include <asm/tlbflush.h>

drivers/mtd/maps/sa1100-flash.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/concat.h>



#include <asm/hardware.h>

#include <asm/io.h>

#include <asm/sizes.h>

#include <asm/mach/flash.h>

include/asm-arm/arch-sa1100/hardware.h

+0 −7
Original line number Diff line number Diff line
@@ -21,13 +21,6 @@ 
#define UNCACHEABLE_ADDR	0xfa050000





/*

 * We requires absolute addresses i.e. (PCMCIA_IO_0_BASE + 0x3f8) for 

 * in*()/out*() macros to be usable for all cases.

 */

#define PCIO_BASE		0





/*

 * SA1100 internal I/O mappings

 *

include/asm-arm/arch-sa1100/io.h

+5 −1
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ 
 * We don't actually have real ISA nor PCI buses, but there is so many 

 * drivers out there that might just work if we fake them...

 */

#define __io(a)			((void __iomem *)(PCIO_BASE + (a)))

static inline void __iomem *__io(unsigned long addr)

{

	return (void __iomem *)addr;

}

#define __io(a)			__io(a)

#define __mem_pci(a)		(a)

#define __mem_isa(a)		(a)

include/asm-arm/arch-sa1100/system.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * Copyright (c) 1999 Nicolas Pitre <nico@cam.org>

 */

#include <linux/config.h>

#include <asm/hardware.h>



static inline void arch_idle(void)

{