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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
sound
/
core
/
rtctimer.c
diff --git
a/sound/core/rtctimer.c
b/sound/core/rtctimer.c
index
79b30f1
..
e957b13
100644
(file)
--- a/
sound/core/rtctimer.c
+++ b/
sound/core/rtctimer.c
@@
-25,6
+25,7
@@
#include <linux/time.h>
#include <linux/threads.h>
#include <linux/interrupt.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 <sound/info.h>
#include <sound/core.h>
#include <sound/timer.h>
#include <sound/info.h>
@@
-177,21
+178,9
@@
static void __exit rtctimer_exit(void)
module_init(rtctimer_init)
module_exit(rtctimer_exit)
module_init(rtctimer_init)
module_exit(rtctimer_exit)
-
MODULE_PARM(rtctimer_freq, "i"
);
+
module_param(rtctimer_freq, int, 0444
);
MODULE_PARM_DESC(rtctimer_freq, "timer frequency in Hz");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(rtctimer_freq, "timer frequency in Hz");
MODULE_LICENSE("GPL");
-#ifndef MODULE
-/* format is: snd-rtctimer=freq */
-
-static int __init rtctimer_setup(char *str)
-{
- (void)(get_option(&str,&rtctimer_freq) == 2);
- return 1;
-}
-
-__setup("snd-rtctimer=", rtctimer_setup);
-#endif /* ifndef MODULE */
-
#endif /* CONFIG_RTC || CONFIG_RTC_MODULE */
#endif /* CONFIG_RTC || CONFIG_RTC_MODULE */