Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6] / drivers / watchdog / mpc5200_wdt.c

diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c
index 11f6a111e75b750dc6716bb19ba2aedb4cdc98aa..80a91d4cea11fff2f2a1cb05c523863f04dfbba2 100644 (file)
--- a/drivers/watchdog/mpc5200_wdt.c
+++ b/drivers/watchdog/mpc5200_wdt.c
@@ -158,7 +158,7 @@ static int mpc5200_wdt_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static struct file_operations mpc5200_wdt_fops = {
+static const struct file_operations mpc5200_wdt_fops = {
        .owner  = THIS_MODULE,
        .write  = mpc5200_wdt_write,
        .ioctl  = mpc5200_wdt_ioctl,