diff options
| author | James Morris <jmorris@namei.org> | 2008-08-27 20:47:34 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-27 20:47:34 -0400 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /sound/soc/s3c24xx/s3c2443-ac97.c | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'sound/soc/s3c24xx/s3c2443-ac97.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c2443-ac97.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index 783349b7fede..19c5c3cf5d8c 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c | |||
| @@ -27,13 +27,13 @@ | |||
| 27 | #include <sound/initval.h> | 27 | #include <sound/initval.h> |
| 28 | #include <sound/soc.h> | 28 | #include <sound/soc.h> |
| 29 | 29 | ||
| 30 | #include <asm/hardware.h> | 30 | #include <mach/hardware.h> |
| 31 | #include <asm/plat-s3c/regs-ac97.h> | 31 | #include <asm/plat-s3c/regs-ac97.h> |
| 32 | #include <asm/arch/regs-gpio.h> | 32 | #include <mach/regs-gpio.h> |
| 33 | #include <asm/arch/regs-clock.h> | 33 | #include <mach/regs-clock.h> |
| 34 | #include <asm/arch/audio.h> | 34 | #include <mach/audio.h> |
| 35 | #include <asm/dma.h> | 35 | #include <asm/dma.h> |
| 36 | #include <asm/arch/dma.h> | 36 | #include <mach/dma.h> |
| 37 | 37 | ||
| 38 | #include "s3c24xx-pcm.h" | 38 | #include "s3c24xx-pcm.h" |
| 39 | #include "s3c24xx-ac97.h" | 39 | #include "s3c24xx-ac97.h" |