diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-06 08:48:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-06 08:48:16 -0800 |
| commit | 5e3bd4e4b1082e406351083784e3de4cdaa50d7a (patch) | |
| tree | 9fdc50af3999e9e978f7df05088a0b8bc8421706 /drivers/ieee1394 | |
| parent | bcee402e764ccbdb507fe56936230af7cb57c813 (diff) | |
| parent | 86431532ec4311dccd0d7513cebae6ffc762756b (diff) | |
| download | op-kernel-dev-5e3bd4e4b1082e406351083784e3de4cdaa50d7a.zip op-kernel-dev-5e3bd4e4b1082e406351083784e3de4cdaa50d7a.tar.gz | |
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: dv1394: move deprecation message from module init to file open
firewire: core: Remove card from list of cards when enable fails
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/dv1394.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index a329e6b..3838bc4 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c @@ -1823,6 +1823,10 @@ static int dv1394_open(struct inode *inode, struct file *file) #endif + printk(KERN_INFO "%s: NOTE, the dv1394 interface is unsupported " + "and will not be available in the new firewire driver stack. " + "Try libraw1394 based programs instead.\n", current->comm); + return 0; } @@ -2567,10 +2571,6 @@ static int __init dv1394_init_module(void) { int ret; - printk(KERN_WARNING - "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; ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16); |
