diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 04:32:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 04:32:56 -0400 |
| commit | 896395c290f902576270d84291c1f7f8bfbe339d (patch) | |
| tree | 650114bff3a5f808ee1d713ecc443b0eaab2e1c3 /drivers/media/video/usbvideo/quickcam_messenger.c | |
| parent | af1cf204ba2fd8135933a2e4df523fb1112dc0e2 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'linus' into tmp.x86.mpparse.new
Diffstat (limited to 'drivers/media/video/usbvideo/quickcam_messenger.c')
| -rw-r--r-- | drivers/media/video/usbvideo/quickcam_messenger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c index 32e536edf09d..3d26a30abe1e 100644 --- a/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/drivers/media/video/usbvideo/quickcam_messenger.c | |||
| @@ -210,7 +210,7 @@ static int qcm_stv_setb(struct usb_device *dev, u16 reg, u8 val) | |||
| 210 | return ret; | 210 | return ret; |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | static int qcm_stv_setw(struct usb_device *dev, u16 reg, u16 val) | 213 | static int qcm_stv_setw(struct usb_device *dev, u16 reg, __le16 val) |
| 214 | { | 214 | { |
| 215 | int ret; | 215 | int ret; |
| 216 | 216 | ||