From 4f9b9d007f3c3a29129c00cd47d971604020044d Mon Sep 17 00:00:00 2001
From: pieterg <pieterg@gmx.com>
Date: Thu, 8 Jul 2010 19:04:05 +0200
Subject: [PATCH] --- yaml --- r: 201226 b: refs/heads/master c:
 7fad69861dba7d84ad94cf917cf33b37c74193e5 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/mach-pxa/colibri-pxa300.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c32420edafae..9782eb41622d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e16e3cb83caa4b4011664c3a3e1101f8a8561dd
+refs/heads/master: 7fad69861dba7d84ad94cf917cf33b37c74193e5
diff --git a/trunk/arch/arm/mach-pxa/colibri-pxa300.c b/trunk/arch/arm/mach-pxa/colibri-pxa300.c
index 45c23fd6df31..40b6ac2de876 100644
--- a/trunk/arch/arm/mach-pxa/colibri-pxa300.c
+++ b/trunk/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,