diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-21 13:28:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-21 13:28:24 +0200 |
| commit | 470fba7ebe60ad9185056b080b331abad24b4df9 (patch) | |
| tree | f83bc13d97adaf5dd0e0f1d6a157b890f868577f /sound/arm | |
| parent | documentation: move mtrr.txt to Doc/x86/ subdir (diff) | |
| parent | Linux v2.6.27-rc4 (diff) | |
| download | linux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz linux-470fba7ebe60ad9185056b080b331abad24b4df9.zip | |
Merge branch 'linus' into x86/doc
Diffstat (limited to '')
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 8 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-pcm.c | 4 | ||||
| -rw-r--r-- | sound/arm/sa11xx-uda1341.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 5b3274b465eb..199cca3366df 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -26,10 +26,10 @@ #include <asm/irq.h> #include <linux/mutex.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" diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c index 0ede9e4656a8..381094aab235 100644 --- a/sound/arm/pxa2xx-pcm.c +++ b/sound/arm/pxa2xx-pcm.c @@ -21,8 +21,8 @@ #include <sound/pcm_params.h> #include <asm/dma.h> -#include <asm/hardware.h> -#include <asm/arch/pxa-regs.h> +#include <mach/hardware.h> +#include <mach/pxa-regs.h> #include "pxa2xx-pcm.h" diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index faeddf3ecedb..b9c51bf8cd71 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c @@ -71,8 +71,8 @@ #include <linux/pm.h> #endif -#include <asm/hardware.h> -#include <asm/arch/h3600.h> +#include <mach/hardware.h> +#include <mach/h3600.h> #include <asm/mach-types.h> #include <asm/dma.h> |