summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-06-11 01:30:23 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-06-11 01:30:23 -0700
commite0a224865173d64eb6e69baaa6f8a4d33954694b (patch)
tree0742b064f747905a6daf497fd2434a28eab941cd /Documentation
parent42197830aa03a35ef951eae52f03f8020e8e8c66 (diff)
parentf5683a632207f573dbd2673ace013530ae83f786 (diff)
Merge bk://linuxusb.bkbits.net/linus-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/usb/philips.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/usb/philips.txt b/Documentation/usb/philips.txt
index 16477ef62de3..926e17dfb975 100644
--- a/Documentation/usb/philips.txt
+++ b/Documentation/usb/philips.txt
@@ -189,10 +189,10 @@ trace
The fbufs, mbufs and trace parameters are global and apply to all connected
cameras. Each camera has its own set of buffers.
-size, fps, palette only specify defaults when you open() the device; this is
-to accommodate some tools that don't set the size or colour palette. You can
-change these settings after open() with the Video4Linux ioctl() calls. The
-default of defaults is QCIF size at 10 fps, BGR order.
+size and fps only specify defaults when you open() the device; this is to
+accommodate some tools that don't set the size. You can change these
+settings after open() with the Video4Linux ioctl() calls. The default of
+defaults is QCIF size at 10 fps, BGR order.
The compression parameter is semiglobal; it sets the initial compression
preference for all camera's, but this parameter can be set per camera with