mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
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
This commit is contained in:
commit
5e3bd4e4b1
2 changed files with 12 additions and 5 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue