diff options
author | Dan Williams <dan.j.williams@intel.com> | 2015-08-27 19:40:26 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2015-08-27 19:40:26 -0400 |
commit | 4a9bf88a5caa8495b5eb2b738d5fb40924bbc538 (patch) | |
tree | 7c2901cb67a7dd7c863fee6924afe24be79cddab /arch/arm/mach-shmobile/pm-rcar.c | |
parent | a06a7576526e10a99ea7721533e7f2df3e26baad (diff) | |
parent | 67a3e8fe90156d41cd480d3dfbb40f3bc007c262 (diff) | |
download | linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.tar.gz linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.tar.bz2 linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.zip |
Merge branch 'pmem-api' into libnvdimm-for-next
Diffstat (limited to 'arch/arm/mach-shmobile/pm-rcar.c')
-rw-r--r-- | arch/arm/mach-shmobile/pm-rcar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/pm-rcar.c b/arch/arm/mach-shmobile/pm-rcar.c index 00022ee56f80..9d3dde00c2fe 100644 --- a/arch/arm/mach-shmobile/pm-rcar.c +++ b/arch/arm/mach-shmobile/pm-rcar.c @@ -12,7 +12,7 @@ #include <linux/err.h> #include <linux/mm.h> #include <linux/spinlock.h> -#include <asm/io.h> +#include <linux/io.h> #include "pm-rcar.h" /* SYSC */ |