diff options
author | Christoph Hellwig <hch@lst.de> | 2015-08-28 09:27:14 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 00:21:07 +0200 |
commit | 2f8e2c877784a0b23f02b41550170a24e14f5c95 (patch) | |
tree | 70578f580b363151376a064ff9515fb8b100f974 /drivers/acpi | |
parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
download | talos-op-linux-2f8e2c877784a0b23f02b41550170a24e14f5c95.tar.gz talos-op-linux-2f8e2c877784a0b23f02b41550170a24e14f5c95.zip |
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 'drivers/acpi')
-rw-r--r-- | drivers/acpi/nfit.c | 2 | ||||
-rw-r--r-- | drivers/acpi/osl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c index c1b8d03e262e..a14ee291d1a7 100644 --- a/drivers/acpi/nfit.c +++ b/drivers/acpi/nfit.c @@ -27,7 +27,7 @@ * For readq() and writeq() on 32-bit builds, the hi-lo, lo-hi order is * irrelevant. */ -#include <asm-generic/io-64-nonatomic-hi-lo.h> +#include <linux/io-64-nonatomic-hi-lo.h> static bool force_enable_dimms; module_param(force_enable_dimms, bool, S_IRUGO|S_IWUSR); diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 739a4a6b3b9b..7d0848190b75 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -43,7 +43,7 @@ #include <asm/io.h> #include <asm/uaccess.h> -#include <asm-generic/io-64-nonatomic-lo-hi.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include "internal.h" |