diff options
| author | Shawn Guo <shawn.guo@freescale.com> | 2014-09-10 10:50:21 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@freescale.com> | 2014-09-10 10:50:21 +0800 |
| commit | 512864a602bf15a290bb7be1cade2f78773016a9 (patch) | |
| tree | d6eb8ab5d569db0537fd1fa8244f78f7a8e9b075 /arch/arm/boot/dts | |
| parent | 9e00b5df703f1ebf370fc54bf4a593506e0f9fcd (diff) | |
| parent | 3f87323170408418f1c8d298c7152eb15e40fbf1 (diff) | |
Merge branch 'imx/soc' into imx/dt
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/vf610-twr.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts index 066f9dfe1b32..189b6975fe7d 100644 --- a/arch/arm/boot/dts/vf610-twr.dts +++ b/arch/arm/boot/dts/vf610-twr.dts @@ -76,7 +76,6 @@ simple-audio-card,cpu { sound-dai = <&sai2>; - master-clkdir-out; frame-master; bitclock-master; }; |