diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 18:40:10 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 18:40:10 +0400 |
commit | 01731cf2eee38410b505c447026e46a591674835 (patch) | |
tree | eeaea94786b4ca993dd3a40d123eb3b6799da1c9 /arch/arm/boot/dts/imx28-m28evk.dts | |
parent | 6496c045292b7afe74b5306c123186976f032125 (diff) | |
parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) | |
download | linux-01731cf2eee38410b505c447026e46a591674835.tar.xz |
Merge 3.11-rc3 into staging-next
We want these fixes here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/imx28-m28evk.dts')
-rw-r--r-- | arch/arm/boot/dts/imx28-m28evk.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts index 880df2f13be8..44d9da57736e 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.dts @@ -184,7 +184,7 @@ reg = <0x0a>; VDDA-supply = <®_3p3v>; VDDIO-supply = <®_3p3v>; - + clocks = <&saif0>; }; eeprom: eeprom@51 { |