git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
include
/
mach
/
ixp4xx-regs.h
diff --git
a/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
b/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
index f5d5b258c3f7592230653770f0e429d07e7842db..588b7665108563e82596642168cd6d2a579ee8c8 100644
(file)
--- a/
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
+++ b/
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
@@
-43,8
+43,6
@@
* Queue Manager
*/
#define IXP4XX_QMGR_BASE_PHYS 0x60000000
-#define IXP4XX_QMGR_BASE_VIRT IOMEM(0xFEF15000)
-#define IXP4XX_QMGR_REGION_SIZE 0x00004000
/*
* Peripheral space, including debug UART. Must be section-aligned so that