aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-01-03 13:54:44 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-04 04:13:48 -0500
commit3e23c658833f135508127c955d40d7c9387f71dd (patch)
tree846afbfa16ad9ea004495260e28bc92224c1f610 /include/sound
parent2ad5dd8dc31137a050f205525a5cd1a4be76c3f1 (diff)
[ALSA] Revert the nested-device patch
Modules: ALSA Core Revert the nested-device patch to keep the compatibility with the current HAL configuration. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/core.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index dbe7a2c30272..90ac6132ea3b 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -134,7 +134,6 @@ struct snd_card {
134 wait_queue_head_t shutdown_sleep; 134 wait_queue_head_t shutdown_sleep;
135 struct work_struct free_workq; /* for free in workqueue */ 135 struct work_struct free_workq; /* for free in workqueue */
136 struct device *dev; 136 struct device *dev;
137 struct class_device *parent_device;
138 137
139#ifdef CONFIG_PM 138#ifdef CONFIG_PM
140 unsigned int power_state; /* power state */ 139 unsigned int power_state; /* power state */