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
powerpc: Fix whitespace merge in mpc8641 hpcn device tree
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
mpc8641_hpcn.dts
diff --git
a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index
ae08761
..
d665e76
100644
(file)
--- a/
arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/
arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@
-411,7
+411,7
@@
0xe000 0 0 1 &i8259 12 2
0xe100 0 0 2 &i8259 9 2
0xe200 0 0 3 &i8259 10 2
- 0xe300 0 0 4 &i8259 112
+ 0xe300 0 0 4 &i8259 11
2
// IDSEL 0x1d Audio
0xe800 0 0 1 &i8259 6 2