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

Commit 0a5709b2 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Include asm/hardware.h instead of asm/arch/hardware.h



Rationalise hardware.h include.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ce07d90a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
#include <linux/string.h>
#include <asm/arch/akita.h>
#include <asm/arch/corgi.h>
#include <asm/arch/hardware.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/sharpsl.h>
#include <asm/arch/spitz.h>
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
 */

#include <linux/init.h>
#include <asm/arch/hardware.h>
#include <asm/hardware.h>
#include <asm/arch/dmtimer.h>
#include <asm/io.h>
#include <asm/arch/irqs.h>
+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@

#include <asm/io.h>
#include <asm/hardware/clock.h>
#include <asm/arch/hardware.h>
#include <asm/hardware.h>

#define OCPI_BASE		0xfffec320
#define OCPI_FAULT		(OCPI_BASE + 0x00)
+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static void omap_pm_init_proc(void)
 *	@state:		suspend state we're entering.
 *
 */
//#include <asm/arch/hardware.h>
//#include <asm/hardware.h>

static int omap_pm_prepare(suspend_state_t state)
{
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/arch/io.h>
#include <asm/arch/hardware.h>
#include <asm/hardware.h>

	.text

Loading