Merge with Linux 2.4.0-test3-pre2.

1 files changed, 50 insertions, 2 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 5e4f351e5..edaa621b0 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -2136,6 +2136,20 @@ CONFIG_ALPHA_SRM
 
   If unsure, say N.
 
+Legacy kernel start address
+CONFIG_ALPHA_LEGACY_START_ADDRESS
+  The 2.4 kernel changed the kernel start address from 0x310000
+  to 0x810000 to make room for the Wildfire's larger SRM console.
+
+  If you're using aboot 0.7 or later, the bootloader will examine
+  the ELF headers to determine where to transfer control.  Unfortunately,
+  most older bootloaders -- APB, or MILO -- hardcoded the kernel
+  start address rather than examining the ELF headers, and the result
+  is a hard lockup.
+
+  Say Y if you have a broken bootloader.  Say N if you do not, or
+  if you wish to run on Wildfire.
+
 Non-standard serial port support
 CONFIG_SERIAL_NONSTANDARD
   Say Y here if you have any non-standard serial boards -- boards
@@ -3260,6 +3274,14 @@ CONFIG_FB_VIRTUAL
  
   If unsure, say N.
 
+CONFIG_FB_SA1100
+  This is a framebuffer device for the SA-1100 LCD Controller.
+  See http://www.linux-fbdev.org/ for information on framebuffer
+  devices.
+
+  If you plan to use the LCD display with your SA-1100 system, say
+  Y here.
+
 Advanced low level driver options
 CONFIG_FBCON_ADVANCED
   The frame buffer console uses character drawing routines that are
@@ -10049,8 +10071,9 @@ CONFIG_USB_DSBR
 Microtek USB scanner support
 CONFIG_USB_MICROTEK
   Say Y here if you want support for the Microtek X6USB and possibly
-  some other scanners. The scanner will appear as a scsi device to the
-  rest of the system. A patched version of SANE is necessary to use the
+  some other scanners by that vendor. The scanner will appear as a
+  scsi generic device to the rest of the system.
+  A patched version of SANE is necessary to use the
   scanner. It's available at 
   http://fachschaft.cup.uni-muenchen.de/~neukum/scanner.html
   This driver can be compiled as a module.
@@ -15450,6 +15473,20 @@ CONFIG_ARCH_PERSONAL_SERVER
   If you have any questions or comments about the  Compaq Personal
   Server, send e-mail to skiff@crl.dec.com
 
+Include support for Assabet
+CONFIG_SA1100_ASSABET
+  Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
+  Microprocessor Development Board (also known as the Assabet).
+
+Include support for the Compaq iPAQ 3600
+CONFIG_SA1100_BITSY
+  Say Y here if you intend to run this kernel on the Compaq iPAQ 3600
+  handheld computer.  Information about this machine and the Linux
+  port to this machine can be found at:
+
+  http://www.handhelds.org/Compaq/index.html#iPAQ_H3600
+  http://www.compaq.com/products/handhelds/pocketpc/
+
 Math emulation
 CONFIG_NWFPE
   Say Y to include the NWFPE floating point emulator in the kernel.
@@ -15506,6 +15543,17 @@ CONFIG_DEBUG_INFO
   time and disk space needed for compilation of the kernel. If in
   doubt say N.
 
+Kernel low-level debugging functions
+CONFIG_DEBUG_LL
+  Say Y here to include definitions of printascii, printchar, printhex
+  in the kernel.  This is helpful if you are debugging code that
+  executes before the console is initialized.
+
+Kernel low-level debugging messages via footbridge serial port
+CONFIG_DEBUG_DC21285_PORT
+  Say Y here if you want the low-level print routines to direct their
+  output to the serial port in the DC21285 (Footbridge).
+
 Split initialisation functions into discardable section
 CONFIG_TEXT_SECTIONS
   If you say Y here, kernel code that is only used during