diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-10-04 05:17:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:32 -0400 |
commit | d56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6 (patch) | |
tree | a48388734053900a8379042757ee241d1e9dfc7b /sound/oss/ac97.c | |
parent | 595182bcdf64fbfd7ae22c67ea6081b7d387d246 (diff) |
[PATCH] The scheduled removal of some OSS drivers
This patch contains the scheduled removal of OSS drivers that:
- have ALSA drivers for the same hardware without known regressions and
- whose Kconfig options have been removed in 2.6.17.
[michal.k.k.piotrowski@gmail.com: build fix]
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/ac97.c')
-rw-r--r-- | sound/oss/ac97.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sound/oss/ac97.c b/sound/oss/ac97.c index 3ba6d91e891d..72cf4ed77937 100644 --- a/sound/oss/ac97.c +++ b/sound/oss/ac97.c | |||
@@ -112,25 +112,6 @@ ac97_init (struct ac97_hwint *dev) | |||
112 | return 0; | 112 | return 0; |
113 | } | 113 | } |
114 | 114 | ||
115 | /* Reset the mixer to the currently saved settings. */ | ||
116 | int | ||
117 | ac97_reset (struct ac97_hwint *dev) | ||
118 | { | ||
119 | int x; | ||
120 | |||
121 | if (dev->reset_device (dev)) | ||
122 | return -1; | ||
123 | |||
124 | /* Now set the registers back to their last-written values. */ | ||
125 | for (x = 0; mixerRegs[x].ac97_regnum != -1; x++) { | ||
126 | int regnum = mixerRegs[x].ac97_regnum; | ||
127 | int value = dev->last_written_mixer_values [regnum / 2]; | ||
128 | if (value >= 0) | ||
129 | ac97_put_register (dev, regnum, value); | ||
130 | } | ||
131 | return 0; | ||
132 | } | ||
133 | |||
134 | /* Return the contents of register REG; use the cache if the value in it | 115 | /* Return the contents of register REG; use the cache if the value in it |
135 | is valid. Returns a negative error code on failure. */ | 116 | is valid. Returns a negative error code on failure. */ |
136 | static int | 117 | static int |
@@ -441,7 +422,6 @@ EXPORT_SYMBOL(ac97_init); | |||
441 | EXPORT_SYMBOL(ac97_set_values); | 422 | EXPORT_SYMBOL(ac97_set_values); |
442 | EXPORT_SYMBOL(ac97_put_register); | 423 | EXPORT_SYMBOL(ac97_put_register); |
443 | EXPORT_SYMBOL(ac97_mixer_ioctl); | 424 | EXPORT_SYMBOL(ac97_mixer_ioctl); |
444 | EXPORT_SYMBOL(ac97_reset); | ||
445 | MODULE_LICENSE("GPL"); | 425 | MODULE_LICENSE("GPL"); |
446 | 426 | ||
447 | 427 | ||