diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /drivers/char/ppdev.c | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'drivers/char/ppdev.c')
| -rw-r--r-- | drivers/char/ppdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index efc485edad1c..c1e3dd837fc8 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c | |||
| @@ -752,13 +752,13 @@ static const struct file_operations pp_fops = { | |||
| 752 | 752 | ||
| 753 | static void pp_attach(struct parport *port) | 753 | static void pp_attach(struct parport *port) |
| 754 | { | 754 | { |
| 755 | class_device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number), | 755 | device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number), |
| 756 | NULL, "parport%d", port->number); | 756 | "parport%d", port->number); |
| 757 | } | 757 | } |
| 758 | 758 | ||
| 759 | static void pp_detach(struct parport *port) | 759 | static void pp_detach(struct parport *port) |
| 760 | { | 760 | { |
| 761 | class_device_destroy(ppdev_class, MKDEV(PP_MAJOR, port->number)); | 761 | device_destroy(ppdev_class, MKDEV(PP_MAJOR, port->number)); |
| 762 | } | 762 | } |
| 763 | 763 | ||
| 764 | static struct parport_driver pp_driver = { | 764 | static struct parport_driver pp_driver = { |