diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 08:36:05 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 08:36:05 +0100 |
commit | ef47bf386e2042c2e483b4ea0259233202ad3ebf (patch) | |
tree | 02baba407d2dbae9d367865c3d52d6e9400c8773 /sound/pci/ice1712 | |
parent | 306ecee926cf79f1b3b5f6035be09ef3d83f1b76 (diff) | |
parent | 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff) | |
download | op-kernel-dev-ef47bf386e2042c2e483b4ea0259233202ad3ebf.zip op-kernel-dev-ef47bf386e2042c2e483b4ea0259233202ad3ebf.tar.gz |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/ice1712.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h index 9da2dae..d063149 100644 --- a/sound/pci/ice1712/ice1712.h +++ b/sound/pci/ice1712/ice1712.h @@ -382,8 +382,8 @@ struct snd_ice1712 { #ifdef CONFIG_PM int (*pm_suspend)(struct snd_ice1712 *); int (*pm_resume)(struct snd_ice1712 *); - int pm_suspend_enabled:1; - int pm_saved_is_spdif_master:1; + unsigned int pm_suspend_enabled:1; + unsigned int pm_saved_is_spdif_master:1; unsigned int pm_saved_spdif_ctrl; unsigned char pm_saved_spdif_cfg; unsigned int pm_saved_route; |