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/xtensa/include/asm/io.h | |
| parent | a06a7576526e10a99ea7721533e7f2df3e26baad (diff) | |
| parent | 67a3e8fe90156d41cd480d3dfbb40f3bc007c262 (diff) | |
| download | blackbird-op-linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.tar.gz blackbird-op-linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.zip | |
Merge branch 'pmem-api' into libnvdimm-for-next
Diffstat (limited to 'arch/xtensa/include/asm/io.h')
| -rw-r--r-- | arch/xtensa/include/asm/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h index c39bb6e61911..867840f5400f 100644 --- a/arch/xtensa/include/asm/io.h +++ b/arch/xtensa/include/asm/io.h @@ -57,6 +57,7 @@ static inline void __iomem *ioremap_cache(unsigned long offset, else BUG(); } +#define ioremap_cache ioremap_cache #define ioremap_wc ioremap_nocache #define ioremap_wt ioremap_nocache |
