diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-04-05 09:20:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-04-05 09:20:34 +0200 |
| commit | ea2a6af517714c52a1209795a03e863e96b460bb (patch) | |
| tree | 3bd443bc9b23ceeaf3743eaf2d6d35ec63c620c9 /arch/tile/include/asm/dma.h | |
| parent | 1b5d43cfb69759d8ef8d30469cea31d0c037aed5 (diff) | |
| parent | 642e7fd23353e22290e3d51719fcb658dc252342 (diff) | |
| download | talos-obmc-linux-ea2a6af517714c52a1209795a03e863e96b460bb.tar.gz talos-obmc-linux-ea2a6af517714c52a1209795a03e863e96b460bb.zip | |
Merge branch 'linus' into sched/urgent, to pick up fixes and updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/tile/include/asm/dma.h')
| -rw-r--r-- | arch/tile/include/asm/dma.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/tile/include/asm/dma.h b/arch/tile/include/asm/dma.h deleted file mode 100644 index 12a7ca16d164..000000000000 --- a/arch/tile/include/asm/dma.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2010 Tilera Corporation. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or - * NON INFRINGEMENT. See the GNU General Public License for - * more details. - */ - -#ifndef _ASM_TILE_DMA_H -#define _ASM_TILE_DMA_H - -#include <asm-generic/dma.h> - -/* Needed by drivers/pci/quirks.c */ -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#endif - -#endif /* _ASM_TILE_DMA_H */ |
