diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
commit | 27b92d4ff2be2359a21ff4acde5b63563ff720e2 (patch) | |
tree | 49691b22fe1318aa68d5ebdff74795f004f0cf8f /sound/soc/samsung/spdif.c | |
parent | 5de0ee574be8f6922a6c33f2fbc7e9b130a2f626 (diff) | |
parent | e58a8947b0264ec1f43ce5deef563b72acf1284f (diff) | |
download | op-kernel-dev-27b92d4ff2be2359a21ff4acde5b63563ff720e2.zip op-kernel-dev-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.gz |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/samsung/spdif.c')
-rw-r--r-- | sound/soc/samsung/spdif.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index f0816404..28c491d 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -13,9 +13,8 @@ #include <linux/clk.h> #include <linux/io.h> -#include <sound/pcm.h> -#include <sound/pcm_params.h> #include <sound/soc.h> +#include <sound/pcm_params.h> #include <plat/audio.h> #include <mach/dma.h> |