Merge with Linux 2.3.49.

1 files changed, 35 insertions, 15 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 878b5abe0..87688bfcb 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -339,10 +339,6 @@ CONFIG_BLK_DEV_IDE
   performance, look for the hdparm package at
   ftp://metalab.unc.edu/pub/Linux/kernel/patches/diskdrives/ .
 
-  To fine-tune ATA/IDE drive/interface parameters for improved
-  performance, look for the hdparm package at
-  ftp://metalab.unc.edu/pub/Linux/kernel/patches/diskdrives/ .
-
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt and
@@ -8478,12 +8474,11 @@ CONFIG_USB_MOUSE
   USB mouse and prefer to use the mouse in its limited Boot Protocol
   mode. This driver is much smaller than the HID one.
 
-Wacom Graphire tablet support
-CONFIG_USB_GRAPHIRE
+Wacom Intuos/Graphire tablet support
+CONFIG_USB_WACOM
   Say Y here if you want to use the USB version of the Wacom
-  Graphire tablet. Make sure you select Mouse and Event support,
-  don't select HID support, because this driver collides with it.
-  Use HIDBP support for keyboards and mice instead if you need it.
+  Intuos or Graphire tablet. Make sure you select Mouse and Event
+  support as well.
 
 Logitech WingMan Force joystick support
 CONFIG_USB_WMFORCE
@@ -8656,6 +8651,18 @@ CONFIG_USB_OV511
   The module will be called ov511.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
+USB ADMtek's Pegasus based ethernet devices support
+CONFIG_USB_PEGASUS
+  Say Y if you want to use your usb ethernet device. Note that
+  the code is still experimental. If you have devices with other
+  vendor IDs than ADMtek's you should change/add them in the
+  driver code and send a message to me (petkan@spct.net) for 
+  update.
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called ov511.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
 USB Kodak DC-2xx Camera support
 CONFIG_USB_DC2XX
   Say Y here if you want to connect this type of still camera to
@@ -8740,7 +8747,18 @@ CONFIG_USB_PLUSB
   5Mbit/s.  Configure this driver after connecting the USB cable via
   ifconfig plusb0 10.0.0.1 pointopoint 10.0.0.2 
   (and vice versa on the other host).
- 
+
+USB Diamond Rio500 support
+CONFIG_USB_RIO500
+  Say Y here if you want to connect a USB rio500 to your
+  computer's USB port. Please read Documentation/usb/rio.txt
+  for more information.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called rio500.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt.
+  
 ACPI support
 CONFIG_ACPI
   Advanced Configuration and Power Interface (ACPI) is an interface
@@ -11113,13 +11131,15 @@ CONFIG_MICROCODE
   Intel processors in P6 family, e.g.  Pentium Pro, Pentium II, 
   Pentium III, Xeon etc. You will obviously need the actual microcode
   binary data itself which is not shipped with the Linux kernel. 
-  Contact Intel to obtain the latest revision of microcode for 
-  your CPU(s). With this support compiled you can use dd(1) to write
-  microcode, for example:
+  With this support compiled you can use dd(1) to write microcode,
+  for example:
+
+     # dd if=/etc/microcode of=/dev/cpu/microcode bs=98304 count=1
 
-     # dd if=/etc/microcode of=/proc/driver/microcode bs=98304 count=1
+  You need to be superuser to do that. For latest news and information
+  on obtaining all the required ingredients for this driver, check:
 
-  You need to be superuser to do that.
+     http://www.ocston.org/~tigran/patches/microcode
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).