diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/block/pktcdvd.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/block/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index a04f60693c39..3e4cce5e4736 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -2612,7 +2612,6 @@ static struct file_operations pkt_ctl_fops = { | |||
| 2612 | static struct miscdevice pkt_misc = { | 2612 | static struct miscdevice pkt_misc = { |
| 2613 | .minor = MISC_DYNAMIC_MINOR, | 2613 | .minor = MISC_DYNAMIC_MINOR, |
| 2614 | .name = "pktcdvd", | 2614 | .name = "pktcdvd", |
| 2615 | .devfs_name = "pktcdvd/control", | ||
| 2616 | .fops = &pkt_ctl_fops | 2615 | .fops = &pkt_ctl_fops |
| 2617 | }; | 2616 | }; |
| 2618 | 2617 | ||