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/x86/include/asm/io.h | |
| parent | a06a7576526e10a99ea7721533e7f2df3e26baad (diff) | |
| parent | 67a3e8fe90156d41cd480d3dfbb40f3bc007c262 (diff) | |
Merge branch 'pmem-api' into libnvdimm-for-next
Diffstat (limited to 'arch/x86/include/asm/io.h')
| -rw-r--r-- | arch/x86/include/asm/io.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index cc9c61bc1abe..83ec9b1d77cc 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -248,12 +248,6 @@ static inline void flush_write_buffers(void) #endif } -static inline void __pmem *arch_memremap_pmem(resource_size_t offset, - unsigned long size) -{ - return (void __force __pmem *) ioremap_cache(offset, size); -} - #endif /* __KERNEL__ */ extern void native_io_delay(void); |