diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:38:13 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:38:13 -0500 |
| commit | 87199134b4a85de56a7508c551ab3b3a3ee35035 (patch) | |
| tree | f7b0d0b4bce377c336a3c8cda0be762d29556cc7 /sound/arm | |
| parent | ea37ccea66e6bdd9f3571418b6461850088c114e (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
Merge branch 'master'
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/aaci.c | 1 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index b2d5db20ec8..559ead6367d 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -20,6 +20,7 @@ #include <asm/io.h> #include <asm/irq.h> +#include <asm/sizes.h> #include <asm/hardware/amba.h> #include <sound/driver.h> diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 38b20efc9c0..d1f9da49872 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -13,7 +13,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/kernel.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/wait.h> #include <linux/delay.h> @@ -275,23 +275,23 @@ static int pxa2xx_ac97_do_resume(snd_card_t *card) return 0; } -static int pxa2xx_ac97_suspend(struct device *_dev, pm_message_t state, u32 level) +static int pxa2xx_ac97_suspend(struct device *_dev, pm_message_t state) { snd_card_t *card = dev_get_drvdata(_dev); int ret = 0; - if (card && level == SUSPEND_DISABLE) + if (card) ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND); return ret; } -static int pxa2xx_ac97_resume(struct device *_dev, u32 level) +static int pxa2xx_ac97_resume(struct device *_dev) { snd_card_t *card = dev_get_drvdata(_dev); int ret = 0; - if (card && level == RESUME_ENABLE) + if (card) ret = pxa2xx_ac97_do_resume(card); return ret; |