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/arm/pxa2xx-ac97-lib.c | |
parent | d281bc9d8a22419abc254f86a7fc268bb99914e1 (diff) | |
parent | bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff) |
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/arm/pxa2xx-ac97-lib.c')
-rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 34c1d94f921..ef6539eea57 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> |