git.samba.org
/
sfrench
/
cifs-2.6.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/dtor/input
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
entry-macro.S
diff --git
a/arch/arm/plat-mxc/include/mach/entry-macro.S
b/arch/arm/plat-mxc/include/mach/entry-macro.S
index 11632028f7d1ba6f44610c373b52b2721ea81cf4..5f01d60da8457920e2db1208f6c249f5ef826412 100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/entry-macro.S
+++ b/
arch/arm/plat-mxc/include/mach/entry-macro.S
@@
-9,6
+9,8
@@
* published by the Free Software Foundation.
*/
+#include <mach/hardware.h>
+
#define AVIC_NIMASK 0x04
@ this macro disables fast irq (not implemented)