diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-04 22:42:39 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-04 22:42:39 -0500 |
| commit | 752c58a471c108d64da1676b2925dfbd83eb177e (patch) | |
| tree | fbffa0d7c54cd812950dffc16d642c9d449f4faf /drivers/usb/input/wacom_wac.h | |
| parent | e52b29c2a637f6854d71a45646d7283d984a6dad (diff) | |
| parent | 10b1fbdb0a0ca91847a534ad26d0bc250c25b74f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/input/wacom_wac.h')
| -rw-r--r-- | drivers/usb/input/wacom_wac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/wacom_wac.h b/drivers/usb/input/wacom_wac.h index ceae7bf59d9f..a1d9ce007970 100644 --- a/drivers/usb/input/wacom_wac.h +++ b/drivers/usb/input/wacom_wac.h | |||
| @@ -20,6 +20,7 @@ enum { | |||
| 20 | PTU, | 20 | PTU, |
| 21 | PL, | 21 | PL, |
| 22 | INTUOS, | 22 | INTUOS, |
| 23 | INTUOS3S, | ||
| 23 | INTUOS3, | 24 | INTUOS3, |
| 24 | INTUOS3L, | 25 | INTUOS3L, |
| 25 | CINTIQ, | 26 | CINTIQ, |
| @@ -34,7 +35,6 @@ struct wacom_features { | |||
| 34 | int pressure_max; | 35 | int pressure_max; |
| 35 | int distance_max; | 36 | int distance_max; |
| 36 | int type; | 37 | int type; |
| 37 | usb_complete_t irq; | ||
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | struct wacom_wac { | 40 | struct wacom_wac { |