Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[sfrench/cifs-2.6.git] / drivers / char / ds1620.c

diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c
index 62cda25724e30d6501870683c53849f5d8e273a5..3d7efc26aad61338818a1416ff4d344ad4227a76 100644 (file)
--- a/drivers/char/ds1620.c
+++ b/drivers/char/ds1620.c
@@ -2,9 +2,7 @@
  * linux/drivers/char/ds1620.c: Dallas Semiconductors DS1620
  *   thermometer driver (as used in the Rebel.com NetWinder)
  */
-#include <linux/config.h>
 #include <linux/module.h>
-#include <linux/sched.h>
 #include <linux/miscdevice.h>
 #include <linux/smp_lock.h>
 #include <linux/delay.h>
@@ -337,7 +335,7 @@ proc_therm_ds1620_read(char *buf, char **start, off_t offset,
 static struct proc_dir_entry *proc_therm_ds1620;
 #endif
 
-static struct file_operations ds1620_fops = {
+static const struct file_operations ds1620_fops = {
        .owner          = THIS_MODULE,
        .open           = nonseekable_open,
        .read           = ds1620_read,