projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull now into release branch
[powerpc.git]
/
drivers
/
ieee1394
/
dv1394.c
diff --git
a/drivers/ieee1394/dv1394.c
b/drivers/ieee1394/dv1394.c
index
dee9529
..
2081413
100644
(file)
--- a/
drivers/ieee1394/dv1394.c
+++ b/
drivers/ieee1394/dv1394.c
@@
-94,7
+94,6
@@
#include <linux/pci.h>
#include <linux/fs.h>
#include <linux/poll.h>
#include <linux/pci.h>
#include <linux/fs.h>
#include <linux/poll.h>
-#include <linux/smp_lock.h>
#include <linux/mutex.h>
#include <linux/bitops.h>
#include <asm/byteorder.h>
#include <linux/mutex.h>
#include <linux/bitops.h>
#include <asm/byteorder.h>
@@
-2564,8
+2563,8
@@
static int __init dv1394_init_module(void)
int ret;
printk(KERN_WARNING
int ret;
printk(KERN_WARNING
- "
WARNING: The dv1394 driver is unsupported and will be removed
"
- "f
rom Linux soon
. Use raw1394 instead.\n");
+ "
NOTE: The dv1394 driver is unsupported and may be removed in a
"
+ "f
uture Linux release
. Use raw1394 instead.\n");
cdev_init(&dv1394_cdev, &dv1394_fops);
dv1394_cdev.owner = THIS_MODULE;
cdev_init(&dv1394_cdev, &dv1394_fops);
dv1394_cdev.owner = THIS_MODULE;