From 89eba5eb77bbf92ffed6686c951cc35f4027e71f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 27 Jul 2000 23:20:03 +0000 Subject: Merge with Linux 2.4.0-test5-pre5. --- Documentation/Changes | 20 +++--- Documentation/Configure.help | 122 ++++++++++++++++++++++++++++++++++-- Documentation/DocBook/Makefile | 34 ++++++---- Documentation/i2c/writing-clients | 2 +- Documentation/kernel-parameters.txt | 12 ++++ 5 files changed, 162 insertions(+), 28 deletions(-) (limited to 'Documentation') diff --git a/Documentation/Changes b/Documentation/Changes index f8b055d21..9479dc463 100644 --- a/Documentation/Changes +++ b/Documentation/Changes @@ -231,25 +231,25 @@ o ftp://metalab.unc.edu/pub/gnu/gcc-2.7.2.3.tar.gz egcs 1.12 --------- -o ftp://ftp.varesearch.com/pub/support/hjl/gcc/egcs-1.1.2/egcs-1.1.2-glibc.x86.tar.bz2 - -o ftp://ftp.varesearch.com/pub/support/hjl/gcc/egcs-1.1.2/egcs-1.1.2-libc5.x86.tar.bz2 - -o ftp://ftp.varesearch.com/pub/support/hjl/gcc/egcs-1.1.2/egcs-1.1.2-alpha.tar.bz2 - +o ftp://ftp.valinux.com/pub/support/hjl/gcc/egcs-1.1.2/egcs-1.1.2-glibc.x86.tar.bz2 + +o ftp://ftp.valinux.com/pub/support/hjl/gcc/egcs-1.1.2/egcs-1.1.2-libc5.x86.tar.bz2 + +o ftp://ftp.valinux.com/pub/support/hjl/gcc/egcs-1.1.2/egcs-1.1.2-alpha.tar.bz2 + Binutils ******** 2.9.1 series ------------ -o ftp://ftp.varesearch.com/pub/support/hjl/binutils/2.9.1/binutils-2.9.1.0.25.tar.gz - +o ftp://ftp.valinux.com/pub/support/hjl/binutils/2.9.1/binutils-2.9.1.0.25.tar.gz + 2.9.5 series ------------ -o ftp://ftp.varesearch.com/pub/support/hjl/binutils/binutils-2.9.5.0.46.tar.gz - +o ftp://ftp.valinux.com/pub/support/hjl/binutils/binutils-2.9.5.0.46.tar.gz + System utilities **************** diff --git a/Documentation/Configure.help b/Documentation/Configure.help index e8430908a..fddcc41f9 100644 --- a/Documentation/Configure.help +++ b/Documentation/Configure.help @@ -6302,6 +6302,66 @@ CONFIG_SCSI_IZIP_SLOW_CTR Generally, saying N is fine. +Parallel port SCSI device support +CONFIG_PPSCSI + There are many external CD-ROM and disk devices that connect through + your computer's parallel port. Lots of them are actually SCSI + devices using a parallel port SCSI adapter. This option enables the + ppSCSI subsystem which contains drivers for many of these external + drives. You may also want to look at CONFIG_PARIDE (Parallel port + IDE device support). + + If you built ppSCSI support into your kernel, you may still build + the individual protocol modules and high-level drivers as loadable + modules. If you build this support as a module, it will be called + ppscsi.o. + + To use the ppSCSI support, you must say Y or M here and also to at + least one protocol driver (e.g. "Shuttle EPST adapter", "Iomega VPI0 + adapter", "Shining ScarSCI adapter" etc.). + +Adaptec APA-348 adapter +CONFIG_PPSCSI_T348 + This option enables support for the APA-348 adapter from Adaptec + (also known as Trantor T348). If you build this as a module it will + be called t348.o. + +Adaptec APA-358 adapter +CONFIG_PPSCSI_T358 + This option enables support for the APA-358 adapter from Adaptec + (also known as Trantor T358). If you build this as a module it will + be called t358.o. + +Iomega VPI0 adapter +CONFIG_PPSCSI_VPI0 + This option enables support for the Iomega VPI0 adapter found in the + original ZIP-100 drives and the Jaz Traveller. If you build this as + a module it will be called vpi0.o. + +OnSpec 90c26 adapter +CONFIG_PPSCSI_ONSCSI + This option enables support for the OnSpec 90c26 in its SCSI adapter + mode. If you build this as a module it will be called onscsi.o. + +Shining SparSCI adapter +CONFIG_PPSCSI_SPARCSI + This option enables support for the WBS-11A parallel port SCSI + adapter. This adapter has been marketed by LinkSys as the + "ParaSCSI+" and by Shining Technologies as the "SparCSI". If you + build this as a module it will be called sparcsi.o. + +Shuttle EPSA-2 adapter +CONFIG_PPSCSI_EPSA2 + This option enables support for the Shuttle Technologies EPSA2 + parallel port SCSI adapter. EPAS2 is a predecessor to the EPST. If + you build this as a module it will be called epsa2.o. + +Shuttle EPST adapter +CONFIG_PPSCSI_EPST + This option enables support for the Shuttle Technologies EPST + parallel port SCSI adapter. If you build this as a module is will + be called epst.o. + SCSI Debug host simulator. (EXPERIMENTAL) CONFIG_SCSI_DEBUG This is a host adapter simulator that can be programmed to simulate @@ -9999,7 +10059,7 @@ CONFIG_USB_SERIAL 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 usb-serial.o. If you want to compile it + The module will be called usbserial.o. If you want to compile it as a module, say M here and read Documentation/modules.txt. USB Generic Serial Driver @@ -10015,12 +10075,22 @@ CONFIG_USB_SERIAL_WHITEHEAT Say Y here if you want to use a ConnectTech WhiteHEAT 4 port USB to serial converter device. + 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 whiteheat.o. If you want to compile it as a + module, say M here and read Documentation/modules.txt. + USB Handspring Visor Driver CONFIG_USB_SERIAL_VISOR Say Y here if you want to connect to your HandSpring Visor through its USB docking station. See http://usbvisor.sourceforge.net for more information on using this driver. + 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 visor.o. If you want to compile it as a + module, say M here and read Documentation/modules.txt. + USB FTDI Single Port Serial Driver CONFIG_USB_SERIAL_FTDI_SIO Say Y here if you want to use a FTDI SIO single port USB to serial @@ -10029,12 +10099,22 @@ CONFIG_USB_SERIAL_FTDI_SIO See http://reality.sgi.com/bryder_wellington/ftdi_sio for more information on this driver and the device. + 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 ftdi_sio.o. If you want to compile it as a + module, say M here and read Documentation/modules.txt. + USB Keyspan PDA Single Port Serial Driver CONFIG_USB_SERIAL_KEYSPAN_PDA Say Y here if you want to use a Keyspan PDA single port USB to serial converter device. This driver makes use of firmware developed from scratch by Brian Warner. + 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 keyspan_pda.o. If you want to compile it + as a module, say M here and read Documentation/modules.txt. + USB Keyspan USA-xxx Serial Driver CONFIG_USB_SERIAL_KEYSPAN Say Y here if you want to use Keyspan USB to serial converter @@ -10045,6 +10125,11 @@ CONFIG_USB_SERIAL_KEYSPAN See http://www.linuxcare.com.au/hugh/keyspan.html 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 keyspan.o. If you want to compile it as a + module, say M here and read Documentation/modules.txt. + USB Keyspan USA-28 Firmware CONFIG_USB_SERIAL_KEYSPAN_USA28 Say Y here to include firmware for the USA-28 converter. @@ -10069,12 +10154,27 @@ USB ZyXEL omni.net LCD Plus Driver CONFIG_USB_SERIAL_OMNINET Say Y here if you want to use a ZyXEL omni.net LCD ISDN TA. + 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 omninet.o. If you want to compile it as a + module, say M here and read Documentation/modules.txt. + USB Digi International AccelePort USB Serial Driver CONFIG_USB_SERIAL_DIGI_ACCELEPORT Say Y here if you want to use a Digi AccelePort USB 4 device, a 4 port USB serial converter. The Digi Acceleport USB 2 and 8 are not yet supported by this driver. + 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 digi_acceleport.o. If you want to compile + it as a module, say M here and read Documentation/modules.txt. + +USB Serial Converter verbose debug +CONFIG_USB_SERIAL_DEBUG + Say Y here if you want verbose debug messages from the USB Serial + Converter. + USB Printer support CONFIG_USB_PRINTER Say Y here if you want to connect a USB printer to your computer's @@ -10085,11 +10185,6 @@ CONFIG_USB_PRINTER The module will be called printer.o. If you want to compile it as a module, say M here and read Documentation/modules.txt. -USB Serial Converter verbose debug -CONFIG_USB_SERIAL_DEBUG - Say Y here if you want verbose debug messages from the USB Serial - Converter. - USB IBM (Xirlink) C-It Camera support CONFIG_USB_IBMCAM Say Y here if you want to connect a IBM "C-It" camera, also known as @@ -10309,6 +10404,18 @@ CONFIG_USB_MICROTEK http://fachschaft.cup.uni-muenchen.de/~neukum/scanner.html This driver can be compiled as a module. +USB Bluetooth support +CONFIG_USB_BLUETOOTH + Say Y here if you want to connect a USB Bluetooth device to your + computer's USB port. You will need the Bluetooth stack (available + at http://developer.axis.com/software/index.shtml) to fully use + the device. + + 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 bluetooth.o. If you want to compile it as + a module, say M here and read Documentation/modules.txt. + Minix fs support CONFIG_MINIX_FS Minix is a simple operating system used in many classes about OS's. @@ -12120,6 +12227,9 @@ CONFIG_I2C_PHILIPSPAR it as a module, say M here and read Documentation/modules.txt. The module will be called i2c-philips-par.o. + Note that if you want support for different parallel port devices, + life will be much easier if you compile them all as modules. + ELV adapter CONFIG_I2C_ELV This supports parallel-port I2C adapters called ELV. Say Y if you diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index b487825c7..06a613ed1 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -11,7 +11,7 @@ JPG-parportbook := $(patsubst %.fig, %.jpeg, $(IMG-parportbook)) $(BOOKS): $(TOPDIR)/scripts/docproc -.PHONY: books ps pdf html clean mrproper db2ps db2pdf db2html +.PHONY: books ps pdf html clean mrproper books: $(BOOKS) @@ -21,11 +21,6 @@ pdf: $(PDF) html: $(HTML) -db2ps db2pdf db2html: - @(which $@ > /dev/null 2>&1) || \ - (echo "*** You need to install DocBook stylesheets ***"; \ - exit 1) - %.eps: %.fig -fig2dev -Leps $< $@ @@ -88,8 +83,7 @@ kernel-api.sgml: kernel-api.tmpl $(APISOURCES) parportbook: $(JPG-parportbook) parportbook.ps: $(EPS-parportbook) parportbook.sgml: parportbook.tmpl $(TOPDIR)/drivers/parport/init.c - $(TOPDIR)/scripts/docgen $(TOPDIR)/drivers/parport/init.c \ - parportbook.sgml + $(TOPDIR)/scripts/docgen $(TOPDIR)/drivers/parport/init.c <$< >$@ DVI := $(patsubst %.sgml, %.dvi, $(BOOKS)) AUX := $(patsubst %.sgml, %.aux, $(BOOKS)) @@ -106,17 +100,35 @@ clean: mrproper: clean -$(RM) $(PS) $(PDF) -$(RM) -r $(HTML) + -$(RM) .depend + -$(RM) $(TOPDIR)/scripts/mkdep-docbook -%.ps : %.sgml db2ps +%.ps : %.sgml + @(which db2ps > /dev/null 2>&1) || \ + (echo "*** You need to install DocBook stylesheets ***"; \ + exit 1) db2ps $< -%.pdf : %.sgml db2pdf +%.pdf : %.sgml + @(which db2pdf > /dev/null 2>&1) || \ + (echo "*** You need to install DocBook stylesheets ***"; \ + exit 1) db2pdf $< -%: %.sgml db2html +%: %.sgml + @(which db2html > /dev/null 2>&1) || \ + (echo "*** You need to install DocBook stylesheets ***"; \ + exit 1) -$(RM) -r $@ db2html $< if [ ! -z "$(JPG-$@)" ]; then cp $(JPG-$@) $@; fi +# +# we could have our own dependency generator +# +# +# .depend: $(TOPDIR)/scripts/mkdep-docbook +# $(TOPDIR)/scripts/mkdep-docbook $(wildcard *.tmpl) > .depend + include $(TOPDIR)/Rules.make diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients index cbacdf8a7..a9328d869 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients @@ -395,7 +395,7 @@ For now, you can ignore the `flags' parameter. It is there for future use. /* Let's see whether this adapter can support what we need. Please substitute the things you need here! For `sensors' drivers, add `! is_isa &&' to the if statement */ - if (i2c_check_functionality(adapter,I2C_FUNC_SMBUS_WORD_DATA | + if (!i2c_check_functionality(adapter,I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_WRITE_BYTE)) goto ERROR0; diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 072508d51..86d716ed3 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -187,6 +187,8 @@ running once the system is up. ftape= [HW] Floppy Tape subsystem debugging options. + gamma= [HW,DRM] + gc= [HW,JOY] gc_2= [HW,JOY] @@ -208,6 +210,8 @@ running once the system is up. hisax= [HW,ISDN] + i810= [HW,DRM] + ibmmcascsi= [HW,MCA,SCSI] IBM MicroChannel SCSI adapter. icn= [HW,ISDN] @@ -234,6 +238,8 @@ running once the system is up. kbd-reset [VT] + keep_initrd [HW, ARM] + load_ramdisk= [RAM] List of ramdisks to load from floppy. logi_busmouse= [HW, MOUSE] @@ -291,6 +297,8 @@ running once the system is up. memfrac= [KNL] + mga= [HW,DRM] + mpu401= [HW,SOUND] msmouse= [HW,MOUSE] Microsoft Mouse. @@ -405,6 +413,10 @@ running once the system is up. quiet= [KNL] Disable log messages. + r128= [HW,DRM] + + raid= [HW,RAID] + ramdisk= [RAM] Sizes of RAM disks in kilobytes [deprecated]. ramdisk_blocksize= -- cgit v1.2.3