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 'fixes' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-cns3xxx
/
include
/
mach
/
entry-macro.S
diff --git
a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
index
6bd83ed
..
d87bfc3
100644
(file)
--- a/
arch/arm/mach-cns3xxx/include/mach/entry-macro.S
+++ b/
arch/arm/mach-cns3xxx/include/mach/entry-macro.S
@@
-8,7
+8,6
@@
* published by the Free Software Foundation.
*/
-#include <mach/hardware.h>
#include <asm/hardware/entry-macro-gic.S>
.macro disable_fiq