Skip to content

Commit

Permalink
[ARM] move asm/xip.h's mach/hardware.h include to mach/xip.h
Browse files Browse the repository at this point in the history 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Dec 14, 2008
1 parent 6ce1b87 commit a02f45c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/arm/include/asm/mtd-xip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-pxa/include/mach/mtd-xip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/mach-sa1100/include/mach/mtd-xip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down

0 comments on commit a02f45c

Please sign in to comment.