Skip to content

L
linux-davinci
Commit a02f45cf authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

[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
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
arch/arm/include/asm/mtd-xip.h
View file @ a02f45cf
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#ifndef __ARM_MTD_XIP_H__ #ifndef __ARM_MTD_XIP_H__
#define __ARM_MTD_XIP_H__ #define __ARM_MTD_XIP_H__
#include <mach/hardware.h>
#include <mach/mtd-xip.h> #include <mach/mtd-xip.h>
/* fill instruction prefetch */ /* fill instruction prefetch */
......
arch/arm/mach-pxa/include/mach/mtd-xip.h
View file @ a02f45cf
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#ifndef __ARCH_PXA_MTD_XIP_H__ #ifndef __ARCH_PXA_MTD_XIP_H__
#define __ARCH_PXA_MTD_XIP_H__ #define __ARCH_PXA_MTD_XIP_H__
#include <mach/hardware.h>
#include <mach/pxa-regs.h> #include <mach/pxa-regs.h>
#define xip_irqpending() (ICIP & ICMR) #define xip_irqpending() (ICIP & ICMR)
......
arch/arm/mach-sa1100/include/mach/mtd-xip.h
View file @ a02f45cf
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#ifndef __ARCH_SA1100_MTD_XIP_H__ #ifndef __ARCH_SA1100_MTD_XIP_H__
#define __ARCH_SA1100_MTD_XIP_H__ #define __ARCH_SA1100_MTD_XIP_H__
#include <mach/hardware.h>
#define xip_irqpending() (ICIP & ICMR) #define xip_irqpending() (ICIP & ICMR)
/* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */ /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment