diff options
| author | Sebastian Reichel <sre@kernel.org> | 2014-05-06 15:44:50 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-05-06 15:44:50 +0200 |
| commit | 695f5ec02203ef23f127eacb86991d23307f3c6f (patch) | |
| tree | ecb9c29268fa34559dfa06472d991bc5d92708be /arch/arm/boot/dts/am335x-bone-common.dtsi | |
| parent | 5bdeae302496a8ac49848f4fed26b1d87a67d966 (diff) | |
| parent | 793ec5f7dccf95c0d6d5d57a925a13261a7cbd2b (diff) | |
| download | linux-n900-dt-with-ssi.tar.bz2 | |
Merge branch 'n900-modem-support' into n900-dt-with-ssin900-dt-with-ssi
Conflicts:
arch/arm/boot/dts/omap3-n900.dts
Diffstat (limited to 'arch/arm/boot/dts/am335x-bone-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am335x-bone-common.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index e3f27ec31718..2e7d932887b5 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -183,7 +183,7 @@ &usb { status = "okay"; - control@44e10000 { + control@44e10620 { status = "okay"; }; @@ -204,7 +204,7 @@ dr_mode = "host"; }; - dma-controller@07402000 { + dma-controller@47402000 { status = "okay"; }; }; |