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/mszeredi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-spear6xx
/
include
/
mach
/
entry-macro.S
diff --git
a/arch/arm/mach-spear6xx/include/mach/entry-macro.S
b/arch/arm/mach-spear6xx/include/mach/entry-macro.S
index
9eaecae
..
8a0b0ed
100644
(file)
--- a/
arch/arm/mach-spear6xx/include/mach/entry-macro.S
+++ b/
arch/arm/mach-spear6xx/include/mach/entry-macro.S
@@
-11,9
+11,8
@@
* warranty of any kind, whether express or implied.
*/
* warranty of any kind, whether express or implied.
*/
-#include <mach/hardware.h>
-#include <mach/spear.h>
#include <asm/hardware/vic.h>
#include <asm/hardware/vic.h>
+#include <mach/hardware.h>
.macro disable_fiq
.endm
.macro disable_fiq
.endm