aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/em-x270.c
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2009-05-11 08:06:16 -0400
committerEric Miao <eric.y.miao@gmail.com>2009-06-16 09:03:34 -0400
commitc63a5751d971b07d8cd80f4d4aae75c676665a3b (patch)
treec51a7ce1a7ee27630d4c13b2479997ca1852afa5 /arch/arm/mach-pxa/em-x270.c
parenta37ed43115b70e832c7e8cc7dabd026d127ad9db (diff)
[ARM] pxa/em-x270: always register AC97 controller device
After commit 6b849bcff0004aa5dd216b4d3eb56f51c9df8a72 (ASoC: Convert PXA AC97 driver to probe with the platform device) AC97 controller device should be registered explicitly for both ASoC and generic AC97 drivers Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
-rw-r--r--arch/arm/mach-pxa/em-x270.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 5184a570ac5f..5343d1f339d6 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -839,10 +839,14 @@ static void __init em_x270_init_spi(void)
839static inline void em_x270_init_spi(void) {} 839static inline void em_x270_init_spi(void) {}
840#endif 840#endif
841 841
842#if defined(CONFIG_SND_PXA2XX_AC97) || defined(CONFIG_SND_PXA2XX_AC97_MODULE) 842#if defined(CONFIG_SND_PXA2XX_AC97_LIB)
843static pxa2xx_audio_ops_t em_x270_ac97_info = {
844 .reset_gpio = 113,
845};
846
843static void __init em_x270_init_ac97(void) 847static void __init em_x270_init_ac97(void)
844{ 848{
845 pxa_set_ac97_info(NULL); 849 pxa_set_ac97_info(&em_x270_ac97_info);
846} 850}
847#else 851#else
848static inline void em_x270_init_ac97(void) {} 852static inline void em_x270_init_ac97(void) {}