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/mn10300/include | |
| parent | 6a398a3ef404e661999cd4c58974cbceb52762e3 (diff) | |
| parent | c546d5db75b452737e554bb9c33dedb46847c4fd (diff) | |
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/mn10300/include')
| -rw-r--r-- | arch/mn10300/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/pci.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild index f892d9de47d9..de30b0c88796 100644 --- a/arch/mn10300/include/asm/Kbuild +++ b/arch/mn10300/include/asm/Kbuild @@ -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 diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index c222d1792d5b..be3debb8fc02 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h @@ -55,7 +55,7 @@ void pcibios_set_master(struct pci_dev *dev); #include <linux/types.h> #include <linux/slab.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/string.h> #include <asm/io.h> |