diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:40:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:40:39 -0700 |
| commit | f379a071091b7ff0a7742ac5e02527897aeb8da4 (patch) | |
| tree | 7bc3c1b980db45f1c8a36cf2faf5423aeed7e173 /arch/arm/boot/dts/am335x-evmsk.dts | |
| parent | d952795d8193c5a7a8eabdc14fab48777fdcd7c8 (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
| download | blackbird-op-linux-f379a071091b7ff0a7742ac5e02527897aeb8da4.tar.gz blackbird-op-linux-f379a071091b7ff0a7742ac5e02527897aeb8da4.zip | |
Merge 3.15-rc3 into tty-next
Diffstat (limited to 'arch/arm/boot/dts/am335x-evmsk.dts')
| -rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index ec08f6f677c3..ab238850a7b2 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -364,7 +364,7 @@ &usb { status = "okay"; - control@44e10000 { + control@44e10620 { status = "okay"; }; @@ -385,7 +385,7 @@ dr_mode = "host"; }; - dma-controller@07402000 { + dma-controller@47402000 { status = "okay"; }; }; |
