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
/
common
/
uengine.c
diff --git
a/arch/arm/common/uengine.c
b/arch/arm/common/uengine.c
index
117cab3
..
7ecd3c0
100644
(file)
--- a/
arch/arm/common/uengine.c
+++ b/
arch/arm/common/uengine.c
@@
-16,8
+16,7
@@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/string.h>
-#include <asm/hardware.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
#include <asm/hardware/uengine.h>
#include <asm/io.h>