diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-17 12:02:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-17 12:02:05 +1100 |
| commit | a274d0266f8f34f2996743d2e409cfb987856a28 (patch) | |
| tree | 6fbdd6de634e9df85b9cbbf9830f6e83a116a3c6 /sound/soc/sh/siu_dai.c | |
| parent | eb5435e628a747c9140c775a0a66f5c2f45b6840 (diff) | |
| parent | 4ea3cad2409335d140b0a4e083cdc6951db47047 (diff) | |
Merge remote branch 'sound/for-next'
Diffstat (limited to 'sound/soc/sh/siu_dai.c')
| -rw-r--r-- | sound/soc/sh/siu_dai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index af53b64d8af2..4973c2939d79 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c @@ -28,7 +28,7 @@ #include <asm/siu.h> #include <sound/control.h> -#include <sound/soc-dai.h> +#include <sound/soc.h> #include "siu.h" |