diff options
author | David S. Miller <davem@davemloft.net> | 2015-08-21 11:44:04 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-21 11:44:04 -0700 |
commit | dc25b25897289bad4907f30151ffe5baf75ff369 (patch) | |
tree | c99301de2cdf66d7af48fc43b6161bda6faaae70 /arch/arm/boot/dts/omap4.dtsi | |
parent | 1a69205c471221a7f9101df164642611e37c52e4 (diff) | |
parent | 0bad90985d39e69ca035fdd70bcc743812641d18 (diff) | |
download | op-kernel-dev-dc25b25897289bad4907f30151ffe5baf75ff369.zip op-kernel-dev-dc25b25897289bad4907f30151ffe5baf75ff369.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/qmi_wwan.c
Overlapping additions of new device IDs to qmi_wwan.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/omap4.dtsi')
-rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 7d31c6f..abc4473 100644 --- 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>; |