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 branches 'regmap-linus' and 'regmap-interface' into regmap-next
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
pxa300.h
diff --git
a/arch/arm/mach-pxa/include/mach/pxa300.h
b/arch/arm/mach-pxa/include/mach/pxa300.h
index
2f33076
..
733b641
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/pxa300.h
+++ b/
arch/arm/mach-pxa/include/mach/pxa300.h
@@
-1,8
+1,7
@@
#ifndef __MACH_PXA300_H
#define __MACH_PXA300_H
-#include <mach/hardware.h>
-#include <mach/pxa3xx-regs.h>
+#include <mach/pxa3xx.h>
#include <mach/mfp-pxa300.h>
#endif /* __MACH_PXA300_H */