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/tiwai/sound-2.6
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
boot
/
dts
/
mpc8569mds.dts
diff --git
a/arch/powerpc/boot/dts/mpc8569mds.dts
b/arch/powerpc/boot/dts/mpc8569mds.dts
index 06332d61830a094e181f3790e4314c007d9ef0df..1e3ec8f059bf9e6622ff2c71b4d163984ff586b4 100644
(file)
--- a/
arch/powerpc/boot/dts/mpc8569mds.dts
+++ b/
arch/powerpc/boot/dts/mpc8569mds.dts
@@
-487,8
+487,8
@@
&qe_pio_f 5 0 /* USBTN */
&qe_pio_f 6 0 /* USBRP */
&qe_pio_f 8 0 /* USBRN */
- &bcsr17
6
0 /* SPEED */
- &bcsr17
5 1
>; /* POWER */
+ &bcsr17
1
0 /* SPEED */
+ &bcsr17
2 0
>; /* POWER */
};
enet0: ucc@2000 {