Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / ieee1394 / dv1394.c

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 55d6ae664fd621639815a6c06b266e4348a19cc3..026e38face5c7d18a13274c451b3c6638af4bd6a 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -2147,7 +2147,7 @@ out:
 }
 
 static struct cdev dv1394_cdev;
-static struct file_operations dv1394_fops=
+static const struct file_operations dv1394_fops=
 {
        .owner =        THIS_MODULE,
        .poll =         dv1394_poll,
@@ -2564,8 +2564,8 @@ static int __init dv1394_init_module(void)
        int ret;
 
        printk(KERN_WARNING
-              "WARNING: The dv1394 driver is unsupported and will be removed "
-              "from Linux soon. Use raw1394 instead.\n");
+              "NOTE: The dv1394 driver is unsupported and may be removed in a "
+              "future Linux release. Use raw1394 instead.\n");
 
        cdev_init(&dv1394_cdev, &dv1394_fops);
        dv1394_cdev.owner = THIS_MODULE;