diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-28 07:23:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-28 07:23:45 +0100 |
| commit | 4d2a0cce5f9cbf8fe3e22929db8179b2957409d5 (patch) | |
| tree | 223ab4e2d6cbd8a736ac0520d69aa232e3a44124 /sound | |
| parent | ac213d74ee16a979066166752ab3449d73f33943 (diff) | |
| parent | 11cd41b893895c76a8f9bee9467f4b0869b5eeb3 (diff) | |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 83d2c7faa884..9350089e1083 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1233,12 +1233,12 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model, memset(&bus_temp, 0, sizeof(bus_temp)); bus_temp.private_data = chip; bus_temp.modelname = model; - bus_temp.power_save = &power_save; bus_temp.pci = chip->pci; bus_temp.ops.command = azx_send_cmd; bus_temp.ops.get_response = azx_get_response; bus_temp.ops.attach_pcm = azx_attach_pcm_stream; #ifdef CONFIG_SND_HDA_POWER_SAVE + bus_temp.power_save = &power_save; bus_temp.ops.pm_notify = azx_power_notify; #endif |