diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:08:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:08:43 -0400 |
| commit | e6600d800fead3e895f16bf9b426578a6301af44 (patch) | |
| tree | fc2bb35ed142b96b31a04b52c3d097100e2653bd /drivers/usb/media/pwc/pwc-ioctl.h | |
| parent | a1d4ebdbb3806e9d2c37f32a043ec54f4534977c (diff) | |
| parent | 3cb4a4f739cccdf0642fa7e3a087e0b8425ff67b (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
Diffstat (limited to 'drivers/usb/media/pwc/pwc-ioctl.h')
| -rw-r--r-- | drivers/usb/media/pwc/pwc-ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/media/pwc/pwc-ioctl.h b/drivers/usb/media/pwc/pwc-ioctl.h index 65805eaa9a1c..5f9cb08bc02e 100644 --- a/drivers/usb/media/pwc/pwc-ioctl.h +++ b/drivers/usb/media/pwc/pwc-ioctl.h | |||
| @@ -75,7 +75,7 @@ | |||
| 75 | #define PWC_FPS_SNAPSHOT 0x00400000 | 75 | #define PWC_FPS_SNAPSHOT 0x00400000 |
| 76 | 76 | ||
| 77 | 77 | ||
| 78 | /* structure for transfering x & y coordinates */ | 78 | /* structure for transferring x & y coordinates */ |
| 79 | struct pwc_coord | 79 | struct pwc_coord |
| 80 | { | 80 | { |
| 81 | int x, y; /* guess what */ | 81 | int x, y; /* guess what */ |