Merge branch 'upstream'

N: Geert Uytterhoeven

E: geert@linux-m68k.org

W: http://home.tvd.be/cr26864/

W: http://users.telenet.be/geertu/

P: 1024/862678A6 C51D 361C 0BD1 4C90 B275  C553 6EEA 11BA 8626 78A6

D: m68k/Amiga and PPC/CHRP Longtrail coordinator

D: Frame buffer device and XF68_FBDev maintainer

D: Atari Falcon chipset IDE

D: Amiga Gayle chipset IDE

D: mipsel NEC DDB Vrc-5074

S: Emiel Vlieberghlaan 2A/21

S: B-3010 Kessel-Lo

S: Haterbeekstraat 55B

S: B-3200 Aarschot

S: Belgium

N: Chris Vance

Finally, if your device can only drive the low 24-bits of

address during PCI bus mastering you might do something like:

	if (pci_set_dma_mask(pdev, 0x00ffffff)) {

	if (pci_set_dma_mask(pdev, DMA_24BIT_MASK)) {

		printk(KERN_WARNING

		       "mydev: 24-bit DMA addressing not available.\n");

		goto ignore_this_device;

# This makefile is used to generate the kernel documentation,

# primarily based on in-line comments in various source files.

# See Documentation/kernel-doc-nano-HOWTO.txt for instruction in how

# to ducument the SRC - and how to read it.

# to document the SRC - and how to read it.

# To add a new book the only step required is to add the book to the

# list of DOCBOOKS.

  <chapter id="sysfs">

     <title>The Filesystem for Exporting Kernel Objects</title>

!Efs/sysfs/file.c

!Efs/sysfs/dir.c

!Efs/sysfs/symlink.c

!Efs/sysfs/bin.c

  </chapter>

	<sect1><title>ata_scsi_error()</title>

	<para>

	ata_scsi_error() is the current hostt->eh_strategy_handler()

	ata_scsi_error() is the current transportt->eh_strategy_handler()

	for libata.  As discussed above, this will be entered in two

	cases - timeout and ATAPI error completion.  This function

	calls low level libata driver's eng_timeout() callback, the