git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
sound
/
core
/
rtctimer.c
diff --git
a/sound/core/rtctimer.c
b/sound/core/rtctimer.c
index
15b6c8a
..
9f7b32e
100644
(file)
--- a/
sound/core/rtctimer.c
+++ b/
sound/core/rtctimer.c
@@
-22,13
+22,10
@@
#include <sound/driver.h>
#include <linux/init.h>
#include <sound/driver.h>
#include <linux/init.h>
-#include <linux/time.h>
-#include <linux/threads.h>
#include <linux/interrupt.h>
#include <linux/moduleparam.h>
#include <sound/core.h>
#include <sound/timer.h>
#include <linux/interrupt.h>
#include <linux/moduleparam.h>
#include <sound/core.h>
#include <sound/timer.h>
-#include <sound/info.h>
#if defined(CONFIG_RTC) || defined(CONFIG_RTC_MODULE)
#if defined(CONFIG_RTC) || defined(CONFIG_RTC_MODULE)
@@
-167,7
+164,7
@@
static int __init rtctimer_init(void)
static void __exit rtctimer_exit(void)
{
if (rtctimer) {
static void __exit rtctimer_exit(void)
{
if (rtctimer) {
- snd_timer_global_
unregister
(rtctimer);
+ snd_timer_global_
free
(rtctimer);
rtctimer = NULL;
}
}
rtctimer = NULL;
}
}