diff options
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/aaci.c | 2 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 7fbd68fab944..5c48e36038f2 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
| @@ -1074,7 +1074,7 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci) | |||
| 1074 | return i; | 1074 | return i; |
| 1075 | } | 1075 | } |
| 1076 | 1076 | ||
| 1077 | static int __devinit aaci_probe(struct amba_device *dev, void *id) | 1077 | static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id) |
| 1078 | { | 1078 | { |
| 1079 | struct aaci *aaci; | 1079 | struct aaci *aaci; |
| 1080 | int ret, i; | 1080 | int ret, i; |
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index a2c12d105c9a..6fdca97186e7 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c | |||
| @@ -65,7 +65,7 @@ static void set_resetgpio_mode(int resetgpio_action) | |||
| 65 | switch (resetgpio_action) { | 65 | switch (resetgpio_action) { |
| 66 | case RESETGPIO_NORMAL_ALTFUNC: | 66 | case RESETGPIO_NORMAL_ALTFUNC: |
| 67 | if (reset_gpio == 113) | 67 | if (reset_gpio == 113) |
| 68 | mode = 113 | GPIO_OUT | GPIO_DFLT_LOW; | 68 | mode = 113 | GPIO_ALT_FN_2_OUT; |
| 69 | if (reset_gpio == 95) | 69 | if (reset_gpio == 95) |
| 70 | mode = 95 | GPIO_ALT_FN_1_OUT; | 70 | mode = 95 | GPIO_ALT_FN_1_OUT; |
| 71 | break; | 71 | break; |