diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-17 09:30:02 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-17 09:30:02 +1000 |
| commit | 8a8d7b68eabb9e566acb51b3fe2809c05e4988ad (patch) | |
| tree | 4d9627b4776208006f026a1122862b08f300f804 /arch/alpha | |
| parent | 5699b73cc4f12c318dccadc8a8947638fb582f60 (diff) | |
| parent | 7fc6069f4fd2660e34b9a8b67deaf9d78f30b5a1 (diff) | |
Merge remote-tracking branch 'block/for-next'
Conflicts:
MAINTAINERS
arch/cris/include/asm/Kbuild
arch/um/include/asm/Kbuild
drivers/block/nvme-core.c
drivers/md/dm.c
include/linux/blkdev.h
mm/backing-dev.c
mm/page-writeback.c
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/alpha/include/asm/pci.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index 76aeb8fa551a..cde23cd03609 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/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/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> |