Colibri/PXA320: Fix AC97 ifdefs and include
Subsystems (3)
PATCH 1/2 Colibri/PXA320: Fix AC97 ifdefs and include
Quoted 1 line
From
39b8a11d86905c0ed50932aa4f57dce8c46e9dd9Mon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Sun, 8 Nov 2009 02:24:05 +0100
Subject: [PATCH 1/2] Colibri/PXA320: Fix AC97 ifdefs and 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.
--- arch/arm/mach-pxa/colibri-pxa320.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/colibri- renamed from arch/arm/mach-pxa/colibri-pxa320.c +0 -0
pxa320.c
index 4945728..ec0e14b 100644
arch/arm/mach-pxa/colibri-pxa320.c +3 -1
@@ -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,
Signature · 1 line
1.6.5
PATCH 1/2 Colibri/PXA320: Fix AC97 ifdefs and include
Quoted 10 lines · Marek Vasut
From
39b8a11d86905c0ed50932aa4f57dce8c46e9dd9Mon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Sun, 8 Nov 2009 02:24:05 +0100
Subject: [PATCH 1/2] Colibri/PXA320: Fix AC97 ifdefs and includeThe 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 <[email protected]>
Fix looks obvious to me. Applied to 'fix', and Daniel, I assume you are OK with this.
PATCH 1/2 Colibri/PXA320: Fix AC97 ifdefs and include
Quoted 6 lines · Eric Miao
Quoted 5 lines · Marek Vasut
From
39b8a11d86905c0ed50932aa4f57dce8c46e9dd9Mon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Sun, 8 Nov 2009 02:24:05 +0100
Subject: [PATCH 1/2] Colibri/PXA320: Fix AC97 ifdefs and include
Quoted 8 lines
Quoted 5 lines
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 <[email protected]>Fix looks obvious to me. Applied to 'fix', and Daniel, I assume you are OK with this.
Sure. Both patches are ok for me. Thanks!