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

Commit a02f45cf authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] move asm/xip.h's mach/hardware.h include to mach/xip.h 



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

arch/arm/include/asm/mtd-xip.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#ifndef __ARM_MTD_XIP_H__

#define __ARM_MTD_XIP_H__



#include <mach/hardware.h>

#include <mach/mtd-xip.h>



/* fill instruction prefetch */

arch/arm/mach-pxa/include/mach/mtd-xip.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#ifndef __ARCH_PXA_MTD_XIP_H__

#define __ARCH_PXA_MTD_XIP_H__



#include <mach/hardware.h>

#include <mach/pxa-regs.h>



#define xip_irqpending()	(ICIP & ICMR)

arch/arm/mach-sa1100/include/mach/mtd-xip.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#ifndef __ARCH_SA1100_MTD_XIP_H__

#define __ARCH_SA1100_MTD_XIP_H__



#include <mach/hardware.h>



#define xip_irqpending()	(ICIP & ICMR)



/* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */