diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
| commit | 5aa37e4f0614e3b1f385426ce1e962e84c275bdf (patch) | |
| tree | 3d8c30207989d09fde8ffb2c3c44c6b923d70062 /sound/soc/pxa/pxa2xx-i2s.c | |
| parent | d4c63ec060f3315653c0ae5bc3a7fe2419a2282f (diff) | |
| parent | b76d69ed721e8365739c3bd5dd7891efbea88494 (diff) | |
| download | linux-5aa37e4f0614e3b1f385426ce1e962e84c275bdf.tar.xz | |
Merge branch 'x86/core' into x86/apic
Diffstat (limited to 'sound/soc/pxa/pxa2xx-i2s.c')
| -rw-r--r-- | sound/soc/pxa/pxa2xx-i2s.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 8f96d87f7b4b..8548818eea08 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -21,10 +21,10 @@ #include <sound/initval.h> #include <sound/soc.h> -#include <asm/hardware.h> -#include <asm/arch/pxa-regs.h> -#include <asm/arch/pxa2xx-gpio.h> -#include <asm/arch/audio.h> +#include <mach/hardware.h> +#include <mach/pxa-regs.h> +#include <mach/pxa2xx-gpio.h> +#include <mach/audio.h> #include "pxa2xx-pcm.h" #include "pxa2xx-i2s.h" |