summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpieterg <pieterg@gmx.com>2010-07-08 19:04:05 +0200
committerEric Miao <eric.y.miao@gmail.com>2010-07-13 10:09:07 +0200
commit7fad69861dba7d84ad94cf917cf33b37c74193e5 (patch)
treed386e142dfcc787399c33505af3cc23b99b18e84
parent[ARM] pxa: fix incorrect order of AC97 reset pin configs (diff)
downloadlinux-7fad69861dba7d84ad94cf917cf33b37c74193e5.tar.xz
linux-7fad69861dba7d84ad94cf917cf33b37c74193e5.zip
[ARM] pxa/colibri-pxa300: fix AC97 init
The wrong CONFIG defines were checked, and the <mach/audio.h> include was missing Signed-off-by: pieter <p.grimmerink@inepro.com> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
-rw-r--r--arch/arm/mach-pxa/colibri-pxa300.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c
index 45c23fd6df31..40b6ac2de876 100644
--- a/arch/arm/mach-pxa/colibri-pxa300.c
+++ b/arch/arm/mach-pxa/colibri-pxa300.c
@@ -26,6 +26,7 @@
#include <mach/colibri.h>
#include <mach/ohci.h>
#include <mach/pxafb.h>
+#include <mach/audio.h>
#include "generic.h"
#include "devices.h"
@@ -145,7 +146,7 @@ static void __init colibri_pxa300_init_lcd(void)
static inline void colibri_pxa300_init_lcd(void) {}
#endif /* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULE */
-#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_pxa310_ac97_pin_config[] __initdata = {
GPIO24_AC97_SYSCLK,
GPIO23_AC97_nACRESET,