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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
char
/
genrtc.c
diff --git
a/drivers/char/genrtc.c
b/drivers/char/genrtc.c
index
588fca5
..
817dc40
100644
(file)
--- a/
drivers/char/genrtc.c
+++ b/
drivers/char/genrtc.c
@@
-43,7
+43,6
@@
#define RTC_VERSION "1.07"
#include <linux/module.h>
#define RTC_VERSION "1.07"
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/miscdevice.h>
#include <linux/fcntl.h>
#include <linux/errno.h>
#include <linux/miscdevice.h>
#include <linux/fcntl.h>
@@
-483,7
+482,7
@@
static inline int gen_rtc_proc_init(void) { return 0; }
* The various file operations we support.
*/
* The various file operations we support.
*/
-static struct file_operations gen_rtc_fops = {
+static
const
struct file_operations gen_rtc_fops = {
.owner = THIS_MODULE,
#ifdef CONFIG_GEN_RTC_X
.read = gen_rtc_read,
.owner = THIS_MODULE,
#ifdef CONFIG_GEN_RTC_X
.read = gen_rtc_read,