projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[linux-2.6]
/
arch
/
arm
/
mach-kirkwood
/
include
/
mach
/
entry-macro.S
diff --git
a/arch/arm/mach-kirkwood/include/mach/entry-macro.S
b/arch/arm/mach-kirkwood/include/mach/entry-macro.S
index
83e0cba
..
8939d36
100644
(file)
--- a/
arch/arm/mach-kirkwood/include/mach/entry-macro.S
+++ b/
arch/arm/mach-kirkwood/include/mach/entry-macro.S
@@
-8,7
+8,7
@@
* warranty of any kind, whether express or implied.
*/
-#include <mach/
kirkwood
.h>
+#include <mach/
bridge-regs
.h>
.macro disable_fiq
.endm