vsprintf: use TOLOWER whenever possible

[safe/jmp/linux-2.6] / sound / arm / pxa2xx-ac97-lib.c

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 71bef45..6fdca97 100644 (file)
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -21,7 +21,6 @@
 #include <sound/pxa2xx-lib.h>
 
 #include <asm/irq.h>
-#include <mach/hardware.h>
 #include <mach/regs-ac97.h>
 #include <mach/pxa2xx-gpio.h>
 #include <mach/audio.h>
@@ -66,7 +65,7 @@ static void set_resetgpio_mode(int resetgpio_action)
                switch (resetgpio_action) {
                case RESETGPIO_NORMAL_ALTFUNC:
                        if (reset_gpio == 113)
-                               mode = 113 | GPIO_OUT | GPIO_DFLT_LOW;
+                               mode = 113 | GPIO_ALT_FN_2_OUT;
                        if (reset_gpio == 95)
                                mode = 95 | GPIO_ALT_FN_1_OUT;
                        break;
@@ -365,7 +364,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
 int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
 {
        int ret;
-       struct pxa2xx_ac97_platform_data *pdata = dev->dev.platform_data;
+       pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;
 
        if (pdata) {
                switch (pdata->reset_gpio) {