diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-08-31 12:56:22 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-08-31 12:56:22 +1000 |
commit | 74a0e751c972e2262d95ddf335b9f65fb7fc5d79 (patch) | |
tree | eca2dc11628c7ba18c007e42ff619467e2c95756 /sound | |
parent | f49210833638e838a0adf970106f56342a8f42b2 (diff) | |
parent | 350732c2c19070cf646c12ef2e60c9a46968b703 (diff) |
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
arch/s390/include/asm/thread_info.h
drivers/mfd/twl4030-irq.c
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/pcm_native.c | 2 | ||||
-rw-r--r-- | sound/usb/card.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 1c6be91dfb98..c74e228731ed 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -23,7 +23,7 @@ #include <linux/file.h> #include <linux/slab.h> #include <linux/time.h> -#include <linux/pm_qos_params.h> +#include <linux/pm_qos.h> #include <linux/uio.h> #include <linux/dma-mapping.h> #include <sound/core.h> diff --git a/sound/usb/card.c b/sound/usb/card.c index 781d9e61adfb..d5754fa5e551 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -628,7 +628,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) if (chip == (void *)-1L) return 0; - if (!(message.event & PM_EVENT_AUTO)) { + if (!PMSG_IS_AUTO(message)) { snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot); if (!chip->num_suspended_intf++) { list_for_each(p, &chip->pcm_list) { |