diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/usb | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/image/microtek.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index 7d21a4f5c425..c84e1486054f 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c | |||
| @@ -361,8 +361,7 @@ int mts_scsi_queuecommand (Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback ); | |||
| 361 | static void mts_transfer_cleanup( struct urb *transfer ); | 361 | static void mts_transfer_cleanup( struct urb *transfer ); |
| 362 | static void mts_do_sg(struct urb * transfer, struct pt_regs *regs); | 362 | static void mts_do_sg(struct urb * transfer, struct pt_regs *regs); |
| 363 | 363 | ||
| 364 | 364 | static inline | |
| 365 | inline static | ||
| 366 | void mts_int_submit_urb (struct urb* transfer, | 365 | void mts_int_submit_urb (struct urb* transfer, |
| 367 | int pipe, | 366 | int pipe, |
| 368 | void* data, | 367 | void* data, |