summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-08-28 10:27:14 +0300
committerArnd Bergmann <arnd@arndb.de>2015-10-15 01:21:07 +0300
commit2f8e2c877784a0b23f02b41550170a24e14f5c95 (patch)
tree70578f580b363151376a064ff9515fb8b100f974 /include
parent049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff)
downloadlinux-2f8e2c877784a0b23f02b41550170a24e14f5c95.tar.xz
move io-64-nonatomic*.h out of asm-generic
These are not implementations of default architecture code but helpers for drivers. Move them to the place they belong to. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Darren Hart <dvhart@linux.intel.com> Acked-by: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/io-64-nonatomic-hi-lo.h (renamed from include/asm-generic/io-64-nonatomic-hi-lo.h)6
-rw-r--r--include/linux/io-64-nonatomic-lo-hi.h (renamed from include/asm-generic/io-64-nonatomic-lo-hi.h)6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/linux/io-64-nonatomic-hi-lo.h
index 2e29d13fc154..11d7e840d913 100644
--- a/include/asm-generic/io-64-nonatomic-hi-lo.h
+++ b/include/linux/io-64-nonatomic-hi-lo.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_IO_64_NONATOMIC_HI_LO_H_
-#define _ASM_IO_64_NONATOMIC_HI_LO_H_
+#ifndef _LINUX_IO_64_NONATOMIC_HI_LO_H_
+#define _LINUX_IO_64_NONATOMIC_HI_LO_H_
#include <linux/io.h>
#include <asm-generic/int-ll64.h>
@@ -29,4 +29,4 @@ static inline void hi_lo_writeq(__u64 val, volatile void __iomem *addr)
#define writeq hi_lo_writeq
#endif
-#endif /* _ASM_IO_64_NONATOMIC_HI_LO_H_ */
+#endif /* _LINUX_IO_64_NONATOMIC_HI_LO_H_ */
diff --git a/include/asm-generic/io-64-nonatomic-lo-hi.h b/include/linux/io-64-nonatomic-lo-hi.h
index 0efacff0a1ce..1a4315f97360 100644
--- a/include/asm-generic/io-64-nonatomic-lo-hi.h
+++ b/include/linux/io-64-nonatomic-lo-hi.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_IO_64_NONATOMIC_LO_HI_H_
-#define _ASM_IO_64_NONATOMIC_LO_HI_H_
+#ifndef _LINUX_IO_64_NONATOMIC_LO_HI_H_
+#define _LINUX_IO_64_NONATOMIC_LO_HI_H_
#include <linux/io.h>
#include <asm-generic/int-ll64.h>
@@ -29,4 +29,4 @@ static inline void lo_hi_writeq(__u64 val, volatile void __iomem *addr)
#define writeq lo_hi_writeq
#endif
-#endif /* _ASM_IO_64_NONATOMIC_LO_HI_H_ */
+#endif /* _LINUX_IO_64_NONATOMIC_LO_HI_H_ */