admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Linus Torvalds
2015-06-25 15:22:36 -07:00
parent 6a398a3ef4 c546d5db75
commit ad90fb9751
57 changed files with 57 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/pci.h
View File

@@ -13,9 +13,9 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/dma-mapping.h>
#include <linux/scatterlist.h>
#include <asm/machdep.h>
#include <asm/scatterlist.h>
#include <asm/io.h>
#include <asm/prom.h>
#include <asm/pci-bridge.h>