diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 13:57:26 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 14:03:44 +0200 |
commit | fad4d169fdd223c62eac162a09deebe582cf28c2 (patch) | |
tree | 0b17b87fac695ec2462436975701c2a046dd0c22 | |
parent | 509ef9898ac916e2001f7abc8f18c39bef0dc0bb (diff) |
backports: fix dma-mapping header
The contents of our asm-generic/dma-mapping-common.h should really be
in asm/dma-mapping.h as that gets included by linux/dma-mapping.h and
the other one is just a helper header that arches *may* include.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | backport/backport-include/asm/dma-mapping.h (renamed from backport/backport-include/asm-generic/dma-mapping-common.h) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backport/backport-include/asm-generic/dma-mapping-common.h b/backport/backport-include/asm/dma-mapping.h index ed2fe610..81e5d91d 100644 --- a/backport/backport-include/asm-generic/dma-mapping-common.h +++ b/backport/backport-include/asm/dma-mapping.h @@ -1,6 +1,6 @@ -#ifndef __BACKPORT_ASM_GENERIC_DMA_MAPPING_COMMON_H -#define __BACKPORT_ASM_GENERIC_DMA_MAPPING_COMMON_H -#include_next <asm-generic/dma-mapping-common.h> +#ifndef __BACKPORT_ASM_DMA_MAPPING_H +#define __BACKPORT_ASM_DMA_MAPPING_H +#include_next <asm/dma-mapping.h> #include <linux/version.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) @@ -22,4 +22,4 @@ dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr, #define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, NULL) #endif -#endif /* __BACKPORT_ASM_GENERIC_DMA_MAPPING_COMMON_H */ +#endif /* __BACKPORT_ASM_DMA_MAPPING_H */ |