Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / arch / cris / arch-v32 / drivers / pcf8563.c

diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c
index d788bda..24b919b 100644 (file)
--- a/arch/cris/arch-v32/drivers/pcf8563.c
+++ b/arch/cris/arch-v32/drivers/pcf8563.c
@@ -17,7 +17,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -51,7 +50,7 @@ int pcf8563_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
 int pcf8563_open(struct inode *, struct file *);
 int pcf8563_release(struct inode *, struct file *);
 
-static struct file_operations pcf8563_fops = {
+static const struct file_operations pcf8563_fops = {
        owner: THIS_MODULE,
        ioctl: pcf8563_ioctl,
        open: pcf8563_open,
@@ -172,7 +171,7 @@ pcf8563_init(void)
                goto err;
 
        if (register_chrdev(PCF8563_MAJOR, DEVICE_NAME, &pcf8563_fops) < 0) {
-               printk(KERN_INFO "%s: Unable to get major numer %d for RTC device.\n",
+               printk(KERN_INFO "%s: Unable to get major number %d for RTC device.\n",
                       PCF8563_NAME, PCF8563_MAJOR);
                return -1;
        }
@@ -325,14 +324,12 @@ pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned
 int
 pcf8563_open(struct inode *inode, struct file *filp)
 {
-       MOD_INC_USE_COUNT;
        return 0;
 }
 
 int
 pcf8563_release(struct inode *inode, struct file *filp)
 {
-       MOD_DEC_USE_COUNT;
        return 0;
 }