Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / char / watchdog / pnx4008_wdt.c

diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c
index db2731ba88e303c48a2333cf424fff0937acbceb..ff6f1ca1e5e7119b48ace7d55843b0b6871367c6 100644 (file)
--- a/drivers/char/watchdog/pnx4008_wdt.c
+++ b/drivers/char/watchdog/pnx4008_wdt.c
@@ -14,7 +14,6 @@
  * or implied.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -239,7 +238,7 @@ static int pnx4008_wdt_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static struct file_operations pnx4008_wdt_fops = {
+static const struct file_operations pnx4008_wdt_fops = {
        .owner = THIS_MODULE,
        .llseek = no_llseek,
        .write = pnx4008_wdt_write,