From 7d7cf2e93c8327c8b80f415f4c1a1121ad0b176f Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Mon, 4 Jan 2010 16:26:32 +0800 Subject: [PATCH] --- yaml --- r: 187443 b: refs/heads/master c: e1aed7ca555af7412ca1336241b918d78485232f h: refs/heads/master i: 187441: c4e8a69c91fb219a519c4f4dff30c71c669d1603 187439: 9e1318fa064df604af66c46895b1347719f11189 v: v3 --- [refs] | 2 +- trunk/sound/arm/pxa2xx-ac97-lib.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 1837161cb3f7..79b204bfdec9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bedbda97175bcc540512f67ce02364100fba5f28 +refs/heads/master: e1aed7ca555af7412ca1336241b918d78485232f diff --git a/trunk/sound/arm/pxa2xx-ac97-lib.c b/trunk/sound/arm/pxa2xx-ac97-lib.c index 6fdca97186e7..7587a748ea06 100644 --- a/trunk/sound/arm/pxa2xx-ac97-lib.c +++ b/trunk/sound/arm/pxa2xx-ac97-lib.c @@ -345,16 +345,6 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend); int pxa2xx_ac97_hw_resume(void) { - if (cpu_is_pxa25x() || cpu_is_pxa27x()) { - pxa_gpio_mode(GPIO31_SYNC_AC97_MD); - pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD); - pxa_gpio_mode(GPIO28_BITCLK_AC97_MD); - pxa_gpio_mode(GPIO29_SDATA_IN_AC97_MD); - } - if (cpu_is_pxa27x()) { - /* Use GPIO 113 or 95 as AC97 Reset on Bulverde */ - set_resetgpio_mode(RESETGPIO_NORMAL_ALTFUNC); - } clk_enable(ac97_clk); return 0; }