git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86/fpu' into x86/urgent
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop32x
/
glantank.c
diff --git
a/arch/arm/mach-iop32x/glantank.c
b/arch/arm/mach-iop32x/glantank.c
index
d4fca75
..
45d6127
100644
(file)
--- a/
arch/arm/mach-iop32x/glantank.c
+++ b/
arch/arm/mach-iop32x/glantank.c
@@
-25,7
+25,7
@@
#include <linux/mtd/physmap.h>
#include <linux/i2c.h>
#include <linux/platform_device.h>
#include <linux/mtd/physmap.h>
#include <linux/i2c.h>
#include <linux/platform_device.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
@@
-34,7
+34,7
@@
#include <asm/mach/time.h>
#include <asm/mach-types.h>
#include <asm/page.h>
#include <asm/mach/time.h>
#include <asm/mach-types.h>
#include <asm/page.h>
-#include <
asm/ar
ch/time.h>
+#include <
ma
ch/time.h>
/*
* GLAN Tank timer tick configuration.
/*
* GLAN Tank timer tick configuration.