diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/usb/gadget/printer.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'drivers/usb/gadget/printer.c')
| -rw-r--r-- | drivers/usb/gadget/printer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c index 4f6bfa100f2a..2c32bd08ee7d 100644 --- a/drivers/usb/gadget/printer.c +++ b/drivers/usb/gadget/printer.c | |||
| @@ -92,7 +92,6 @@ struct printer_dev { | |||
| 92 | u8 *current_rx_buf; | 92 | u8 *current_rx_buf; |
| 93 | u8 printer_status; | 93 | u8 printer_status; |
| 94 | u8 reset_printer; | 94 | u8 reset_printer; |
| 95 | struct class_device *printer_class_dev; | ||
| 96 | struct cdev printer_cdev; | 95 | struct cdev printer_cdev; |
| 97 | struct device *pdev; | 96 | struct device *pdev; |
| 98 | u8 printer_cdev_open; | 97 | u8 printer_cdev_open; |