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 'next/late' with mainline
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
bcm4708-luxul-xap-1510.dts
diff --git
a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
index 35e6ed6a3ef7a6e21e414a14da10770edec8f6b6..f591b0f256d82511c9d6d5d1ebee24cc180cc81e 100644
(file)
--- a/
arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
+++ b/
arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
@@
-55,10
+55,6
@@
};
};
-&uart0 {
- status = "okay";
-};
-
&spi_nor {
status = "okay";
};