diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 20:24:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 20:24:36 -0400 |
| commit | c3474be4ddcae0256a13cbbe35d849c153c4ec4b (patch) | |
| tree | 03a19c106dea8c60a26eff45444a290df330c98a /drivers/ieee1394/dv1394.c | |
| parent | 5a92d635bec814fb53595fc80488765bc0d4ff0e (diff) | |
| parent | 199c1167f5e8123a9b0a9ab1e8b78a6aa4b2733f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: change deprecation status of dv1394
Diffstat (limited to 'drivers/ieee1394/dv1394.c')
| -rw-r--r-- | drivers/ieee1394/dv1394.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index dee9529aa8e7..026e38face5c 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
| @@ -2564,8 +2564,8 @@ static int __init dv1394_init_module(void) | |||
| 2564 | int ret; | 2564 | int ret; |
| 2565 | 2565 | ||
| 2566 | printk(KERN_WARNING | 2566 | printk(KERN_WARNING |
| 2567 | "WARNING: The dv1394 driver is unsupported and will be removed " | 2567 | "NOTE: The dv1394 driver is unsupported and may be removed in a " |
| 2568 | "from Linux soon. Use raw1394 instead.\n"); | 2568 | "future Linux release. Use raw1394 instead.\n"); |
| 2569 | 2569 | ||
| 2570 | cdev_init(&dv1394_cdev, &dv1394_fops); | 2570 | cdev_init(&dv1394_cdev, &dv1394_fops); |
| 2571 | dv1394_cdev.owner = THIS_MODULE; | 2571 | dv1394_cdev.owner = THIS_MODULE; |