diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-11-28 01:19:33 -0500 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2008-12-02 01:42:39 -0500 |
commit | 1f017a9964c5b3b9581d3a5732110cb1e0444281 (patch) | |
tree | a710b14fe62ab2d49cfec9036272cfe4a276c614 /sound | |
parent | 02f652626a8f23e513877cb751c8ea533739c28f (diff) |
[ARM] pxa: move AC97 register definitions into dedicated regs-ac97.h
The optimal change would be to move the AC97 register definitions into
the AC97 driver, unfortunately, the registers are shared between several
files. Move them into a dedicated regs-ac97.h first.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
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/soc/pxa/pxa2xx-ac97.c | 1 |
3 files changed, 3 insertions, 1 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 @@ | |||
22 | 22 | ||
23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
25 | #include <mach/pxa-regs.h> | 25 | #include <mach/regs-ac97.h> |
26 | #include <mach/pxa2xx-gpio.h> | 26 | #include <mach/pxa2xx-gpio.h> |
27 | #include <mach/audio.h> | 27 | #include <mach/audio.h> |
28 | 28 | ||
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 @@ | |||
22 | 22 | ||
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <mach/pxa-regs.h> | 24 | #include <mach/pxa-regs.h> |
25 | #include <mach/regs-ac97.h> | ||
25 | #include <mach/audio.h> | 26 | #include <mach/audio.h> |
26 | 27 | ||
27 | #include "pxa2xx-pcm.h" | 28 | #include "pxa2xx-pcm.h" |
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 @@ | |||
21 | 21 | ||
22 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
23 | #include <mach/pxa-regs.h> | 23 | #include <mach/pxa-regs.h> |
24 | #include <mach/regs-ac97.h> | ||
24 | 25 | ||
25 | #include "pxa2xx-pcm.h" | 26 | #include "pxa2xx-pcm.h" |
26 | #include "pxa2xx-ac97.h" | 27 | #include "pxa2xx-ac97.h" |