Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (bb641ab4) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/00-INDEX

+0 −2

Original line number	Diff line number	Diff line
		@@ -183,8 +183,6 @@ i386/
		- directory with info about Linux on Intel 32 bit architecture.
		ia64/
		- directory with info about Linux on Intel 64 bit architecture.
		ide.txt
		- important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).
		infiniband/
		- directory with documents concerning Linux InfiniBand support.
		initrd.txt

Documentation/cdrom/ide-cd

+9 −9

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ This driver provides the following features:
		---------------

		0. The ide-cd relies on the ide disk driver. See
		Documentation/ide.txt for up-to-date information on the ide
		Documentation/ide/ide.txt for up-to-date information on the ide
		driver.

		1. Make sure that the ide and ide-cd drivers are compiled into the
		@@ -64,7 +64,7 @@ This driver provides the following features:

		Depending on what type of IDE interface you have, you may need to
		specify additional configuration options. See
		Documentation/ide.txt.
		Documentation/ide/ide.txt.

		2. You should also ensure that the iso9660 filesystem is either
		compiled into the kernel or available as a loadable module. You
		@@ -84,7 +84,7 @@ This driver provides the following features:
		on the primary IDE interface are called `hda' and `hdb',
		respectively. The drives on the secondary interface are called
		`hdc' and `hdd'. (Interfaces at other locations get other letters
		in the third position; see Documentation/ide.txt.)
		in the third position; see Documentation/ide/ide.txt.)

		If you want your CDROM drive to be found automatically by the
		driver, you should make sure your IDE interface uses either the
		@@ -93,7 +93,7 @@ This driver provides the following features:
		be jumpered as `master'. (If for some reason you cannot configure
		your system in this manner, you can probably still use the driver.
		You may have to pass extra configuration information to the kernel
		when you boot, however. See Documentation/ide.txt for more
		when you boot, however. See Documentation/ide/ide.txt for more
		information.)

		4. Boot the system. If the drive is recognized, you should see a
		@@ -201,7 +201,7 @@ TEST
		This section discusses some common problems encountered when trying to
		use the driver, and some possible solutions. Note that if you are
		experiencing problems, you should probably also review
		Documentation/ide.txt for current information about the underlying
		Documentation/ide/ide.txt for current information about the underlying
		IDE support code. Some of these items apply only to earlier versions
		of the driver, but are mentioned here for completeness.

		@@ -211,7 +211,7 @@ from the driver.
		a. Drive is not detected during booting.

		- Review the configuration instructions above and in
		Documentation/ide.txt, and check how your hardware is
		Documentation/ide/ide.txt, and check how your hardware is
		configured.

		- If your drive is the only device on an IDE interface, it should
		@@ -219,7 +219,7 @@ a. Drive is not detected during booting.

		- If your IDE interface is not at the standard addresses of 0x170
		or 0x1f0, you'll need to explicitly inform the driver using a
		lilo option. See Documentation/ide.txt. (This feature was
		lilo option. See Documentation/ide/ide.txt. (This feature was
		added around kernel version 1.3.30.)

		- If the autoprobing is not finding your drive, you can tell the
		@@ -245,7 +245,7 @@ a. Drive is not detected during booting.
		Support for some interfaces needing extra initialization is
		provided in later 1.3.x kernels. You may need to turn on
		additional kernel configuration options to get them to work;
		see Documentation/ide.txt.
		see Documentation/ide/ide.txt.

		Even if support is not available for your interface, you may be
		able to get it to work with the following procedure. First boot
		@@ -299,7 +299,7 @@ c. System hangups.
		be worked around by specifying the `serialize' option when
		booting. Recent kernels should be able to detect the need for
		this automatically in most cases, but the detection is not
		foolproof. See Documentation/ide.txt for more information
		foolproof. See Documentation/ide/ide.txt for more information
		about the `serialize' option and the CMD640B.

		- Note that many MS-DOS CDROM drivers will work with such buggy

Documentation/ide/00-INDEX

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		00-INDEX
		- this file
		ChangeLog.ide-cd.1994-2004
		- ide-cd changelog
		ChangeLog.ide-floppy.1996-2002
		- ide-floppy changelog
		ChangeLog.ide-tape.1995-2002
		- ide-tape changelog
		ide-tape.txt
		- info on the IDE ATAPI streaming tape driver
		ide.txt
		- important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).

Documentation/ide.txt→Documentation/ide/ide.txt

+10 −10

File changed and moved.

Contains only whitespace changes.

Documentation/kernel-parameters.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -712,7 +712,7 @@ and is between 256 and 4096 characters. It is defined in the file
		Format: <cyl>,<head>,<sect>

		hd?= [HW] (E)IDE subsystem
		hd?lun= See Documentation/ide.txt.
		hd?lun= See Documentation/ide/ide.txt.

		highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact
		size of <nn>. This works even on boxes that have no
		@@ -766,14 +766,14 @@ and is between 256 and 4096 characters. It is defined in the file

		ide= [HW] (E)IDE subsystem
		Format: ide=nodma or ide=doubler or ide=reverse
		See Documentation/ide.txt.
		See Documentation/ide/ide.txt.

		ide?= [HW] (E)IDE subsystem
		Format: ide?=noprobe or chipset specific parameters.
		See Documentation/ide.txt.
		See Documentation/ide/ide.txt.

		idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed
		See Documentation/ide.txt.
		See Documentation/ide/ide.txt.

		idle= [X86]
		Format: idle=poll or idle=mwait