Commit 9b4f2e95 authored by Stefan Richter's avatar Stefan Richter
Browse files

ieee1394: merge from Linus 



Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parents 3c6c65f5 803db244

.gitignore

+8 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
*.ko

*.so

*.mod.c

*.i

*.lst

*.symtypes



#

# Top-level generic files
@@ -30,6 +33,11 @@ include/config 
include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

include/linux/utsrelease.h



# stgit generated dirs

patches-*



# quilt's files

patches

series

CREDITS

+6 −6
Original line number Diff line number Diff line
@@ -528,11 +528,11 @@ S: Oxford 
S: United Kingdom



N: Luiz Fernando N. Capitulino

E: lcapitulino@terra.com.br

E: lcapitulino@prefeitura.sp.gov.br

W: http://www.telecentros.sp.gov.br

D: Little fixes and a lot of janitorial work

S: E-GOV Telecentros SP

E: lcapitulino@mandriva.com.br

E: lcapitulino@gmail.com

W: http://www.cpu.eti.br

D: misc kernel hacking

S: Mandriva

S: Brazil



N: Remy Card
@@ -2209,7 +2209,7 @@ S: (address available on request) 
S: USA



N: Ian McDonald

E: iam4@cs.waikato.ac.nz

E: ian.mcdonald@jandi.co.nz

E: imcdnzl@gmail.com

W: http://wand.net.nz/~iam4

W: http://imcdnzl.blogspot.com

Documentation/DMA-mapping.txt

+4 −4
Original line number Diff line number Diff line
@@ -698,12 +698,12 @@ these interfaces. Remember that, as defined, consistent mappings are 
always going to be SAC addressable.



The first thing your driver needs to do is query the PCI platform

layer with your devices DAC addressing capabilities:

layer if it is capable of handling your devices DAC addressing

capabilities:



	int pci_dac_set_dma_mask(struct pci_dev *pdev, u64 mask);

	int pci_dac_dma_supported(struct pci_dev *hwdev, u64 mask);



This routine behaves identically to pci_set_dma_mask.  You may not

use the following interfaces if this routine fails.

You may not use the following interfaces if this routine fails.



Next, DMA addresses using this API are kept track of using the

dma64_addr_t type.  It is guaranteed to be big enough to hold any

Documentation/DocBook/kernel-api.tmpl

+5 −4
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ 
!Iinclude/linux/ktime.h

!Iinclude/linux/hrtimer.h

!Ekernel/hrtimer.c

     </sect1>

     <sect1><title>Workqueues and Kevents</title>

!Ekernel/workqueue.c

     </sect1>

     <sect1><title>Internal Functions</title>

!Ikernel/exit.c
@@ -300,7 +303,7 @@ X!Ekernel/module.c 
     </sect1>



     <sect1><title>Resources Management</title>

!Ekernel/resource.c

!Ikernel/resource.c

     </sect1>



     <sect1><title>MTRR Handling</title>
@@ -312,9 +315,7 @@ X!Ekernel/module.c 
!Edrivers/pci/pci-driver.c

!Edrivers/pci/remove.c

!Edrivers/pci/pci-acpi.c

<!-- kerneldoc does not understand __devinit

X!Edrivers/pci/search.c

 -->

!Edrivers/pci/search.c

!Edrivers/pci/msi.c

!Edrivers/pci/bus.c

<!-- FIXME: Removed for now since no structured comments in source

Documentation/DocBook/mtdnand.tmpl

+6 −5
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
		for most of the implementations. These functions can be replaced by the

		board driver if neccecary. Those functions are called via pointers in the

		NAND chip description structure. The board driver can set the functions which

		should be replaced by board dependend functions before calling nand_scan().

		should be replaced by board dependent functions before calling nand_scan().

		If the function pointer is NULL on entry to nand_scan() then the pointer

		is set to the default function which is suitable for the detected chip type.

		</para></listitem>
@@ -133,7 +133,7 @@ 
	  	[REPLACEABLE]</para><para>

		Replaceable members hold hardware related functions which can be 

		provided by the board driver. The board driver can set the functions which

		should be replaced by board dependend functions before calling nand_scan().

		should be replaced by board dependent functions before calling nand_scan().

		If the function pointer is NULL on entry to nand_scan() then the pointer

		is set to the default function which is suitable for the detected chip type.

		</para></listitem>
@@ -156,9 +156,8 @@ 
     	<title>Basic board driver</title>

	<para>

		For most boards it will be sufficient to provide just the

		basic functions and fill out some really board dependend

		basic functions and fill out some really board dependent

		members in the nand chip description structure.

		See drivers/mtd/nand/skeleton for reference.

	</para>

	<sect1>

		<title>Basic defines</title>
@@ -1295,7 +1294,9 @@ in this page</entry> 
     </para>

!Idrivers/mtd/nand/nand_base.c

!Idrivers/mtd/nand/nand_bbt.c

!Idrivers/mtd/nand/nand_ecc.c

<!-- No internal functions for kernel-doc:

X!Idrivers/mtd/nand/nand_ecc.c

-->

  </chapter>



  <chapter id="credits">

CRA Git | Maintained and supported by SUSTech CRA and CCSE