diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 02:36:05 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 02:36:05 -0500 |
| commit | ef47bf386e2042c2e483b4ea0259233202ad3ebf (patch) | |
| tree | 02baba407d2dbae9d367865c3d52d6e9400c8773 /sound/pci/ice1712 | |
| parent | 306ecee926cf79f1b3b5f6035be09ef3d83f1b76 (diff) | |
| parent | 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff) | |
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 9da2dae64c5b..d063149e7047 100644 --- a/sound/pci/ice1712/ice1712.h +++ b/sound/pci/ice1712/ice1712.h | |||
| @@ -382,8 +382,8 @@ struct snd_ice1712 { | |||
| 382 | #ifdef CONFIG_PM | 382 | #ifdef CONFIG_PM |
| 383 | int (*pm_suspend)(struct snd_ice1712 *); | 383 | int (*pm_suspend)(struct snd_ice1712 *); |
| 384 | int (*pm_resume)(struct snd_ice1712 *); | 384 | int (*pm_resume)(struct snd_ice1712 *); |
| 385 | int pm_suspend_enabled:1; | 385 | unsigned int pm_suspend_enabled:1; |
| 386 | int pm_saved_is_spdif_master:1; | 386 | unsigned int pm_saved_is_spdif_master:1; |
| 387 | unsigned int pm_saved_spdif_ctrl; | 387 | unsigned int pm_saved_spdif_ctrl; |
| 388 | unsigned char pm_saved_spdif_cfg; | 388 | unsigned char pm_saved_spdif_cfg; |
| 389 | unsigned int pm_saved_route; | 389 | unsigned int pm_saved_route; |