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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
pxa930.h
diff --git
a/arch/arm/mach-pxa/include/mach/pxa930.h
b/arch/arm/mach-pxa/include/mach/pxa930.h
index
d45f76a
..
190363b
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/pxa930.h
+++ b/
arch/arm/mach-pxa/include/mach/pxa930.h
@@
-1,8
+1,7
@@
#ifndef __MACH_PXA930_H
#define __MACH_PXA930_H
#ifndef __MACH_PXA930_H
#define __MACH_PXA930_H
-#include <mach/hardware.h>
-#include <mach/pxa3xx-regs.h>
+#include <mach/pxa3xx.h>
#include <mach/mfp-pxa930.h>
#endif /* __MACH_PXA930_H */
#include <mach/mfp-pxa930.h>
#endif /* __MACH_PXA930_H */