Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad90fb97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block 

Pull asm/scatterlist.h removal from Jens Axboe:
 "We don't have any specific arch scatterlist anymore, since parisc
  finally switched over.  Kill the include"

* 'for-4.2/sg' of git://git.kernel.dk/linux-block:
  remove scatterlist.h generation from arch Kbuild files
  remove <asm/scatterlist.h>
parents 6a398a3e c546d5db

Documentation/scsi/scsi_mid_low_api.txt

+1 −1
Original line number Diff line number Diff line
@@ -1269,7 +1269,7 @@ Members of interest: 
    request_buffer - either contains data buffer or scatter gather list

                     depending on the setting of use_sg. Scatter gather

                     elements are defined by 'struct scatterlist' found

                     in include/asm/scatterlist.h .

                     in include/linux/scatterlist.h .

    done         - function pointer that should be invoked by LLD when the

                   SCSI command is completed (successfully or otherwise).

                   Should only be called by an LLD if the LLD has accepted

arch/alpha/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -6,6 +6,5 @@ generic-y += exec.h 
generic-y += irq_work.h

generic-y += mcs_spinlock.h

generic-y += preempt.h

generic-y += scatterlist.h

generic-y += sections.h

generic-y += trace_clock.h

arch/alpha/include/asm/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


#include <linux/spinlock.h>

#include <linux/dma-mapping.h>

#include <asm/scatterlist.h>

#include <linux/scatterlist.h>

#include <asm/machvec.h>

#include <asm-generic/pci-bridge.h>

arch/arc/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ generic-y += poll.h 
generic-y += posix_types.h

generic-y += preempt.h

generic-y += resource.h

generic-y += scatterlist.h

generic-y += sembuf.h

generic-y += shmbuf.h

generic-y += siginfo.h

arch/arm/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ generic-y += poll.h 
generic-y += preempt.h

generic-y += resource.h

generic-y += rwsem.h

generic-y += scatterlist.h

generic-y += seccomp.h

generic-y += sections.h

generic-y += segment.h