diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 09:30:20 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 09:30:20 +0100 |
commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/usb/image/microtek.c | |
parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
download | kernel_goldelico_gta04-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip kernel_goldelico_gta04-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz kernel_goldelico_gta04-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.bz2 |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/usb/image/microtek.c')
-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 7d21a4f..c84e148 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 ); static void mts_transfer_cleanup( struct urb *transfer ); static void mts_do_sg(struct urb * transfer, struct pt_regs *regs); - -inline static +static inline void mts_int_submit_urb (struct urb* transfer, int pipe, void* data, |