diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 00:22:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 00:22:36 +0200 |
| commit | ad90fb97515b732bc27a0109baa10af636c3c8cd (patch) | |
| tree | 9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7 /arch/frv | |
| parent | Merge branch 'for-4.2/drivers' of git://git.kernel.dk/linux-block (diff) | |
| parent | remove scatterlist.h generation from arch Kbuild files (diff) | |
| download | linux-ad90fb97515b732bc27a0109baa10af636c3c8cd.tar.xz 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/frv')
| -rw-r--r-- | arch/frv/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/frv/include/asm/dma-mapping.h | 2 | ||||
| -rw-r--r-- | arch/frv/include/asm/pci.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index e3f81b53578e..30edce31e5c2 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild @@ -5,5 +5,4 @@ generic-y += exec.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h -generic-y += scatterlist.h generic-y += trace_clock.h diff --git a/arch/frv/include/asm/dma-mapping.h b/arch/frv/include/asm/dma-mapping.h index 1746a2b8e6e7..2840adcd6d92 100644 --- a/arch/frv/include/asm/dma-mapping.h +++ b/arch/frv/include/asm/dma-mapping.h @@ -2,9 +2,9 @@ #define _ASM_DMA_MAPPING_H #include <linux/device.h> +#include <linux/scatterlist.h> #include <asm/cache.h> #include <asm/cacheflush.h> -#include <asm/scatterlist.h> #include <asm/io.h> /* diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h index a6d4ed042c70..e43d22c58ad5 100644 --- a/arch/frv/include/asm/pci.h +++ b/arch/frv/include/asm/pci.h @@ -14,7 +14,7 @@ #define _ASM_FRV_PCI_H #include <linux/mm.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci.h> |