diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-06 08:36:37 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-06 08:36:44 -0500 |
| commit | 4f5b31c3f29f4351d2740faed3a6c569b800b39d (patch) | |
| tree | 363075890bc33f9b08e2ad813be0697437b52f49 /sound/soc/s3c24xx/s3c24xx-i2s.c | |
| parent | 86027ae78c9294bb450b76eec28cfb431a8fb3ee (diff) | |
| parent | 899e6cf5e6d83a91d2e257f7a4e8ca98db3831cc (diff) | |
Merge commit 's3c-iis-header' into HEAD
Diffstat (limited to 'sound/soc/s3c24xx/s3c24xx-i2s.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 1c2b0549710..c0c6ec1536b 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c | |||
| @@ -30,11 +30,11 @@ | |||
| 30 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 31 | #include <mach/regs-gpio.h> | 31 | #include <mach/regs-gpio.h> |
| 32 | #include <mach/regs-clock.h> | 32 | #include <mach/regs-clock.h> |
| 33 | #include <mach/audio.h> | 33 | #include <plat/audio.h> |
| 34 | #include <asm/dma.h> | 34 | #include <asm/dma.h> |
| 35 | #include <mach/dma.h> | 35 | #include <mach/dma.h> |
| 36 | 36 | ||
| 37 | #include <asm/plat-s3c24xx/regs-iis.h> | 37 | #include <plat/regs-iis.h> |
| 38 | 38 | ||
| 39 | #include "s3c24xx-pcm.h" | 39 | #include "s3c24xx-pcm.h" |
| 40 | #include "s3c24xx-i2s.h" | 40 | #include "s3c24xx-i2s.h" |