diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 01:11:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 01:11:28 +0100 |
| commit | 138a6d7ea2deb3080116a4f99019e181b62e5ce5 (patch) | |
| tree | 424622059405352935fbf1dde015a1e130b56198 /arch/arm/boot/dts/bcm2835.dtsi | |
| parent | Documentation: ja_JP: Update broken link to tpp (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | linux-138a6d7ea2deb3080116a4f99019e181b62e5ce5.tar.xz linux-138a6d7ea2deb3080116a4f99019e181b62e5ce5.zip | |
Merge 3.13-rc4 into char-misc-next
We want these fixes in here.
Diffstat (limited to 'arch/arm/boot/dts/bcm2835.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/bcm2835.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index 1e12aeff403b..aa537ed13f0a 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -85,6 +85,8 @@ reg = <0x7e205000 0x1000>; interrupts = <2 21>; clocks = <&clk_i2c>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; }; @@ -93,6 +95,8 @@ reg = <0x7e804000 0x1000>; interrupts = <2 21>; clocks = <&clk_i2c>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; }; |