projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-arm
/
arch-integrator
/
io.h
diff --git
a/include/asm-arm/arch-integrator/io.h
b/include/asm-arm/arch-integrator/io.h
index 31f2deab51b0d54d3cd8f891b0a56da01f0d3e34..c8f2175948bd8d1a6e10e65790a5cd2b865e2de4 100644
(file)
--- a/
include/asm-arm/arch-integrator/io.h
+++ b/
include/asm-arm/arch-integrator/io.h
@@
-32,6
+32,5
@@
#define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a)))
#define __mem_pci(a) (a)
-#define __mem_isa(a) ((a) + PCI_MEMORY_VADDR)
#endif