Commit 160acc2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'sg' of git://git.kernel.dk/linux-2.6-block:
  [SG] Get rid of __sg_mark_end()
  cleanup asm/scatterlist.h includes
  SG: Make sg_init_one() use general table init functions
parents a7e1e001 c46f2334

block/ll_rw_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -1369,7 +1369,7 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq, 
	} /* segments in rq */



	if (sg)

		__sg_mark_end(sg);

		sg_mark_end(sg);



	return nsegs;

}

crypto/anubis.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/module.h>

#include <linux/mm.h>

#include <asm/byteorder.h>

#include <asm/scatterlist.h>

#include <linux/crypto.h>

#include <linux/types.h>

crypto/blowfish.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/module.h>

#include <linux/mm.h>

#include <asm/byteorder.h>

#include <asm/scatterlist.h>

#include <linux/crypto.h>

#include <linux/types.h>

crypto/compress.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/types.h>

#include <linux/crypto.h>

#include <linux/errno.h>

#include <asm/scatterlist.h>

#include <linux/string.h>

#include "internal.h"

crypto/crypto_null.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/init.h>

#include <linux/module.h>

#include <linux/mm.h>

#include <asm/scatterlist.h>

#include <linux/crypto.h>

#include <linux/string.h>