projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-scan', 'acpi-processor' and 'acpi-assorted'
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap4.dtsi
diff --git
a/arch/arm/boot/dts/omap4.dtsi
b/arch/arm/boot/dts/omap4.dtsi
index
7d31c6f
..
abc4473
100644
(file)
--- a/
arch/arm/boot/dts/omap4.dtsi
+++ b/
arch/arm/boot/dts/omap4.dtsi
@@
-191,7
+191,8
@@
};
omap4_padconf_global: omap4_padconf_global@5a0 {
- compatible = "syscon";
+ compatible = "syscon",
+ "simple-bus";
reg = <0x5a0 0x170>;
#address-cells = <1>;
#size-cells = <1>;