git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Regulators: virtual - use sysfs attribute groups
[safe/jmp/linux-2.6]
/
drivers
/
misc
/
phantom.c
diff --git
a/drivers/misc/phantom.c
b/drivers/misc/phantom.c
index
daf5856
..
04c2726
100644
(file)
--- a/
drivers/misc/phantom.c
+++ b/
drivers/misc/phantom.c
@@
-6,7
+6,7
@@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * You need a
n
userspace library to cooperate with this driver. It (and other
+ * You need a userspace library to cooperate with this driver. It (and other
* info) may be obtained here:
* http://www.fi.muni.cz/~xslaby/phantom.html
* or alternatively, you might use OpenHaptics provided by Sensable.
* info) may be obtained here:
* http://www.fi.muni.cz/~xslaby/phantom.html
* or alternatively, you might use OpenHaptics provided by Sensable.
@@
-22,6
+22,7
@@
#include <linux/interrupt.h>
#include <linux/cdev.h>
#include <linux/phantom.h>
#include <linux/interrupt.h>
#include <linux/cdev.h>
#include <linux/phantom.h>
+#include <linux/sched.h>
#include <linux/smp_lock.h>
#include <asm/atomic.h>
#include <linux/smp_lock.h>
#include <asm/atomic.h>
@@
-271,7
+272,7
@@
static unsigned int phantom_poll(struct file *file, poll_table *wait)
return mask;
}
return mask;
}
-static struct file_operations phantom_file_ops = {
+static
const
struct file_operations phantom_file_ops = {
.open = phantom_open,
.release = phantom_release,
.unlocked_ioctl = phantom_ioctl,
.open = phantom_open,
.release = phantom_release,
.unlocked_ioctl = phantom_ioctl,
@@
-399,9
+400,9
@@
static int __devinit phantom_probe(struct pci_dev *pdev,
goto err_irq;
}
goto err_irq;
}
- if (IS_ERR(device_create
_drvdata
(phantom_class, &pdev->dev,
-
MKDEV(phantom_major, minor)
,
-
NULL,
"phantom%u", minor)))
+ if (IS_ERR(device_create(phantom_class, &pdev->dev,
+
MKDEV(phantom_major, minor), NULL
,
+ "phantom%u", minor)))
dev_err(&pdev->dev, "can't create device\n");
pci_set_drvdata(pdev, pht);
dev_err(&pdev->dev, "can't create device\n");
pci_set_drvdata(pdev, pht);