diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2009-11-08 03:05:11 +0100 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-11-13 16:25:47 +0800 |
| commit | 15f593cfcb1178f832aaf9ec0200acd8c3c3348c (patch) | |
| tree | c4657732c7e61c36997842b4bb2ddae77d0eb12d | |
| parent | 2b5e080ae946b4a346b842a73d80f319b7a6453c (diff) | |
| download | kernel_samsung_aries-15f593cfcb1178f832aaf9ec0200acd8c3c3348c.zip kernel_samsung_aries-15f593cfcb1178f832aaf9ec0200acd8c3c3348c.tar.gz kernel_samsung_aries-15f593cfcb1178f832aaf9ec0200acd8c3c3348c.tar.bz2 | |
[ARM] pxa/colibri: fix AC97 ifdefs and add missing include
The AC97 part wasn't initialized on Colibri/PXA320 because the macros
were wrong. Also, the code didn't compile because of a header file not
being included.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa320.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c index 4945728..ec0e14b 100644 --- a/arch/arm/mach-pxa/colibri-pxa320.c +++ b/arch/arm/mach-pxa/colibri-pxa320.c @@ -27,6 +27,7 @@ #include <mach/colibri.h> #include <mach/pxafb.h> #include <mach/ohci.h> +#include <mach/audio.h> #include "generic.h" #include "devices.h" @@ -145,7 +146,8 @@ static void __init colibri_pxa320_init_lcd(void) static inline void colibri_pxa320_init_lcd(void) {} #endif -#if defined(SND_AC97_CODEC) || defined(SND_AC97_CODEC_MODULE) +#if defined(CONFIG_SND_AC97_CODEC) || \ + defined(CONFIG_SND_AC97_CODEC_MODULE) static mfp_cfg_t colibri_pxa320_ac97_pin_config[] __initdata = { GPIO34_AC97_SYSCLK, GPIO35_AC97_SDATA_IN_0, |