projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm-dt-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
include
/
asm-generic
/
io.h
diff --git
a/include/asm-generic/io.h
b/include/asm-generic/io.h
index
db5b890
..
72974cb
100644
(file)
--- a/
include/asm-generic/io.h
+++ b/
include/asm-generic/io.h
@@
-1152,9
+1152,7
@@
static inline void memcpy_toio(volatile void __iomem *addr, const void *buffer,
}
#endif
-#ifndef CONFIG_GENERIC_DEVMEM_IS_ALLOWED
extern int devmem_is_allowed(unsigned long pfn);
-#endif
#endif /* __KERNEL__ */