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' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
armada-398-db.dts
diff --git
a/arch/arm/boot/dts/armada-398-db.dts
b/arch/arm/boot/dts/armada-398-db.dts
index e8604281c3c9916522d496937c73c1b31c6f22c9..f0e0379f7619220d39defb0f72887623ba850768 100644
(file)
--- a/
arch/arm/boot/dts/armada-398-db.dts
+++ b/
arch/arm/boot/dts/armada-398-db.dts
@@
-118,7
+118,7
@@
};
};
- pcie
-controller
{
+ pcie {
status = "okay";
pcie@1,0 {