diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-02 22:07:40 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-02 22:07:40 +0000 |
| commit | c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch) | |
| tree | bd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /sound | |
| parent | d281bc9d8a22419abc254f86a7fc268bb99914e1 (diff) | |
| parent | bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff) | |
| download | linux-stable-c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea.tar.gz linux-stable-c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea.tar.bz2 linux-stable-c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 2 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 1 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-pcm.h | 2 | ||||
| -rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 34c1d94f921e..ef6539eea579 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c @@ -22,7 +22,7 @@ #include <asm/irq.h> #include <mach/hardware.h> -#include <mach/pxa-regs.h> +#include <mach/regs-ac97.h> #include <mach/pxa2xx-gpio.h> #include <mach/audio.h> diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index c2635beb4c88..85cf591d4e11 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -22,6 +22,7 @@ #include <mach/hardware.h> #include <mach/pxa-regs.h> +#include <mach/regs-ac97.h> #include <mach/audio.h> #include "pxa2xx-pcm.h" diff --git a/sound/arm/pxa2xx-pcm.h b/sound/arm/pxa2xx-pcm.h index 5c4a4d38a083..65f86b56ba42 100644 --- a/sound/arm/pxa2xx-pcm.h +++ b/sound/arm/pxa2xx-pcm.h @@ -9,7 +9,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <asm/dma.h> +#include <mach/dma.h> struct pxa2xx_runtime_data { int dma_ch; diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index a7a3a9c5c6ff..5e727393cfd4 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -21,6 +21,7 @@ #include <mach/hardware.h> #include <mach/pxa-regs.h> +#include <mach/regs-ac97.h> #include "pxa2xx-pcm.h" #include "pxa2xx-ac97.h" |