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

Commit a62c80e5 authored Jan 07, 2006 by Russell King Committed by Russell King Jan 07, 2006

[ARM] Move AMBA include files to include/linux/amba/



Since the ARM AMBA bus is used on MIPS as well as ARM, we need
to make the bus available for other architectures to use.  Move
the AMBA include files from include/asm-arm/hardware/ to
include/linux/amba/

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 6351610d

arch/arm/common/amba.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,10 +12,10 @@
	#include <linux/device.h>		#include <linux/device.h>
	#include <linux/string.h>		#include <linux/string.h>
	#include <linux/slab.h>		#include <linux/slab.h>
			#include <linux/amba/bus.h>

	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/irq.h>		#include <asm/irq.h>
	#include <asm/hardware/amba.h>
	#include <asm/sizes.h>		#include <asm/sizes.h>

	#define to_amba_device(d) container_of(d, struct amba_device, dev)		#define to_amba_device(d) container_of(d, struct amba_device, dev)

arch/arm/mach-aaec2000/core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,11 +20,11 @@
	#include <linux/interrupt.h>		#include <linux/interrupt.h>
	#include <linux/timex.h>		#include <linux/timex.h>
	#include <linux/signal.h>		#include <linux/signal.h>
			#include <linux/amba/bus.h>

	#include <asm/hardware.h>		#include <asm/hardware.h>
	#include <asm/irq.h>		#include <asm/irq.h>
	#include <asm/sizes.h>		#include <asm/sizes.h>
	#include <asm/hardware/amba.h>

	#include <asm/mach/flash.h>		#include <asm/mach/flash.h>
	#include <asm/mach/irq.h>		#include <asm/mach/irq.h>

arch/arm/mach-aaec2000/core.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@
	*		*
	*/		*/

	#include <asm/hardware/amba_clcd.h>		#include <linux/amba/clcd.h>

	struct sys_timer;		struct sys_timer;

arch/arm/mach-integrator/core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,11 +15,11 @@
	#include <linux/interrupt.h>		#include <linux/interrupt.h>
	#include <linux/sched.h>		#include <linux/sched.h>
	#include <linux/smp.h>		#include <linux/smp.h>
			#include <linux/amba/bus.h>

	#include <asm/hardware.h>		#include <asm/hardware.h>
	#include <asm/irq.h>		#include <asm/irq.h>
	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/hardware/amba.h>
	#include <asm/hardware/arm_timer.h>		#include <asm/hardware/arm_timer.h>
	#include <asm/arch/cm.h>		#include <asm/arch/cm.h>
	#include <asm/system.h>		#include <asm/system.h>

arch/arm/mach-integrator/impd1.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,11 +18,11 @@
	#include <linux/device.h>		#include <linux/device.h>
	#include <linux/errno.h>		#include <linux/errno.h>
	#include <linux/mm.h>		#include <linux/mm.h>
			#include <linux/amba/bus.h>
			#include <linux/amba/clcd.h>

	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/hardware/icst525.h>		#include <asm/hardware/icst525.h>
	#include <asm/hardware/amba.h>
	#include <asm/hardware/amba_clcd.h>
	#include <asm/arch/lm.h>		#include <asm/arch/lm.h>
	#include <asm/arch/impd1.h>		#include <asm/arch/impd1.h>
	#include <asm/sizes.h>		#include <asm/sizes.h>