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 tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
at91-ariettag25.dts
diff --git
a/arch/arm/boot/dts/at91-ariettag25.dts
b/arch/arm/boot/dts/at91-ariettag25.dts
index 21c5b56c92e083cb618b4e05d8a30733b89ee519..f877f3430bcc299b29d2b41ea7a4a40dc426b12f 100644
(file)
--- a/
arch/arm/boot/dts/at91-ariettag25.dts
+++ b/
arch/arm/boot/dts/at91-ariettag25.dts
@@
-59,12
+59,12
@@
};
};
- usb0: ohci@
00
600000 {
+ usb0: ohci@600000 {
status = "okay";
num-ports = <3>;
};
- usb1: ehci@
00
700000 {
+ usb1: ehci@700000 {
status = "okay";
};
};