diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /drivers/usb/media/pwc/pwc-ioctl.h | |
parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
download | op-kernel-dev-f2cbb4f01936a3e4225692e03b084b78c56d386d.zip op-kernel-dev-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.gz |
Auto merge with /home/aegl/GIT/linus
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 65805ea..5f9cb08 100644 --- a/drivers/usb/media/pwc/pwc-ioctl.h +++ b/drivers/usb/media/pwc/pwc-ioctl.h @@ -75,7 +75,7 @@ #define PWC_FPS_SNAPSHOT 0x00400000 -/* structure for transfering x & y coordinates */ +/* structure for transferring x & y coordinates */ struct pwc_coord { int x, y; /* guess what */ |