summaryrefslogtreecommitdiffstats
path: root/drivers/usb/media/pwc/pwc-ctrl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 07:08:43 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 07:08:43 -0700
commite6600d800fead3e895f16bf9b426578a6301af44 (patch)
treefc2bb35ed142b96b31a04b52c3d097100e2653bd /drivers/usb/media/pwc/pwc-ctrl.c
parenta1d4ebdbb3806e9d2c37f32a043ec54f4534977c (diff)
parent3cb4a4f739cccdf0642fa7e3a087e0b8425ff67b (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-ctrl.c')
-rw-r--r--drivers/usb/media/pwc/pwc-ctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/usb/media/pwc/pwc-ctrl.c
index 42352f531bc..42ec468d52d 100644
--- a/drivers/usb/media/pwc/pwc-ctrl.c
+++ b/drivers/usb/media/pwc/pwc-ctrl.c
@@ -1100,7 +1100,7 @@ static inline int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)
unsigned char buf[4];
/* set new relative angle; angles are expressed in degrees * 100,
- but cam as .5 degree resolution, hence devide by 200. Also
+ but cam as .5 degree resolution, hence divide by 200. Also
the angle must be multiplied by 64 before it's send to
the cam (??)
*/