diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:24:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:24:36 -0700 |
| commit | c3474be4ddcae0256a13cbbe35d849c153c4ec4b (patch) | |
| tree | 03a19c106dea8c60a26eff45444a290df330c98a /drivers | |
| parent | 5a92d635bec814fb53595fc80488765bc0d4ff0e (diff) | |
| parent | 199c1167f5e8123a9b0a9ab1e8b78a6aa4b2733f (diff) | |
| download | op-kernel-dev-c3474be4ddcae0256a13cbbe35d849c153c4ec4b.zip op-kernel-dev-c3474be4ddcae0256a13cbbe35d849c153c4ec4b.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: change deprecation status of dv1394
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ieee1394/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/ieee1394/dv1394.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index b8a4734..cd84a55 100644 --- a/drivers/ieee1394/Kconfig +++ b/drivers/ieee1394/Kconfig @@ -138,9 +138,9 @@ config IEEE1394_DV1394 tristate "OHCI-DV I/O support (deprecated)" depends on IEEE1394 && IEEE1394_OHCI1394 help - The dv1394 driver will be removed from Linux in a future release. - Its functionality is now provided by raw1394 together with libraries - such as libiec61883. + The dv1394 driver is unsupported and may be removed from Linux in a + future release. Its functionality is now provided by raw1394 together + with libraries such as libiec61883. config IEEE1394_RAWIO tristate "Raw IEEE1394 I/O support" diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index dee9529..026e38f 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c @@ -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; |
