Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 153712
b: refs/heads/master
c: c63a575
h: refs/heads/master
v: v3
  • Loading branch information
Mike Rapoport authored and Eric Miao committed Jun 16, 2009
1 parent dfb7980 commit d8eefae
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a37ed43115b70e832c7e8cc7dabd026d127ad9db
refs/heads/master: c63a5751d971b07d8cd80f4d4aae75c676665a3b
8 changes: 6 additions & 2 deletions trunk/arch/arm/mach-pxa/em-x270.c
Original file line number Diff line number Diff line change
Expand Up @@ -839,10 +839,14 @@ static void __init em_x270_init_spi(void)
static inline void em_x270_init_spi(void) {}
#endif

#if defined(CONFIG_SND_PXA2XX_AC97) || defined(CONFIG_SND_PXA2XX_AC97_MODULE)
#if defined(CONFIG_SND_PXA2XX_AC97_LIB)
static pxa2xx_audio_ops_t em_x270_ac97_info = {
.reset_gpio = 113,
};

static void __init em_x270_init_ac97(void)
{
pxa_set_ac97_info(NULL);
pxa_set_ac97_info(&em_x270_ac97_info);
}
#else
static inline void em_x270_init_ac97(void) {}
Expand Down

0 comments on commit d8eefae

Please sign in to comment.