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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-orion5x
/
include
/
mach
/
entry-macro.S
diff --git
a/arch/arm/mach-orion5x/include/mach/entry-macro.S
b/arch/arm/mach-orion5x/include/mach/entry-macro.S
index 4351937035cd5415c97a38db47dbf4a4c15de60e..d658992e54011345f4aada15e80bcfe416fb8e6d 100644
(file)
--- a/
arch/arm/mach-orion5x/include/mach/entry-macro.S
+++ b/
arch/arm/mach-orion5x/include/mach/entry-macro.S
@@
-8,7
+8,7
@@
* warranty of any kind, whether express or implied.
*/
-#include <mach/
orion5x
.h>
+#include <mach/
bridge-regs
.h>
.macro disable_fiq
.endm