Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus

This commit is contained in:
Mark Brown 2015-02-05 19:36:29 +00:00
commit c503ca52a5

View file

@ -368,7 +368,7 @@
};
i2s1: i2s@13960000 {
compatible = "samsung,s5pv210-i2s";
compatible = "samsung,s3c6410-i2s";
reg = <0x13960000 0x100>;
clocks = <&clock CLK_I2S1>;
clock-names = "iis";
@ -378,7 +378,7 @@
};
i2s2: i2s@13970000 {
compatible = "samsung,s5pv210-i2s";
compatible = "samsung,s3c6410-i2s";
reg = <0x13970000 0x100>;
clocks = <&clock CLK_I2S2>;
clock-names = "iis";