diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-19 11:39:38 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-19 11:39:38 +0200 |
| commit | 1e2ae4ddd373af6fa3ea2483d7fc4a08c7f54395 (patch) | |
| tree | a1d78a51725dbcf2d8ffb38873c0825f48944015 /sound/soc/s3c24xx/s3c2412-i2s.c | |
| parent | ff54250a0ebab7f90a5f848a0ba63f999830c872 (diff) | |
| parent | 002fbad829883a3ad9b185077f9e54c37dc7502d (diff) | |
Merge branch 'fix/asoc' into for-linus
* fix/asoc:
ASoC: OMAP: Fix FS polarity in OSK5912 machine driver
ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver
ASoC: Fix include build error in s3c2412-i2s.c
ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
ASoC: Fix jive_wm8750.c build problems
ASoC: pxa-ssp: allow setting of dai format 0
Diffstat (limited to 'sound/soc/s3c24xx/s3c2412-i2s.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index 1ca3cdaa821..b7e0b3f0bfc 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -33,8 +33,8 @@ #include <plat/regs-s3c2412-iis.h> -#include <plat/regs-gpio.h> #include <plat/audio.h> +#include <mach/regs-gpio.h> #include <mach/dma.h> #include "s3c24xx-pcm.h" |