git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'libnvdimm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
io.h
diff --git
a/arch/x86/include/asm/io.h
b/arch/x86/include/asm/io.h
index
7cfc085
..
de25aad
100644
(file)
--- a/
arch/x86/include/asm/io.h
+++ b/
arch/x86/include/asm/io.h
@@
-250,12
+250,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);