diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 15:22:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 15:22:36 -0700 |
| commit | ad90fb97515b732bc27a0109baa10af636c3c8cd (patch) | |
| tree | 9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7 /arch/alpha/include/asm/pci.h | |
| parent | 6a398a3ef404e661999cd4c58974cbceb52762e3 (diff) | |
| parent | c546d5db75b452737e554bb9c33dedb46847c4fd (diff) | |
| download | blackbird-op-linux-ad90fb97515b732bc27a0109baa10af636c3c8cd.tar.gz blackbird-op-linux-ad90fb97515b732bc27a0109baa10af636c3c8cd.zip | |
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>
Diffstat (limited to 'arch/alpha/include/asm/pci.h')
| -rw-r--r-- | arch/alpha/include/asm/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h index 8b02afeb6319..98f2eeee8f68 100644 --- a/arch/alpha/include/asm/pci.h +++ b/arch/alpha/include/asm/pci.h @@ -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> |
