git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-arm
/
arch-ixp2000
/
ixdp2x00.h
diff --git
a/include/asm-arm/arch-ixp2000/ixdp2x00.h
b/include/asm-arm/arch-ixp2000/ixdp2x00.h
index
3a398df
..
546e2e8
100644
(file)
--- a/
include/asm-arm/arch-ixp2000/ixdp2x00.h
+++ b/
include/asm-arm/arch-ixp2000/ixdp2x00.h
@@
-21,8
+21,8
@@
* On board CPLD memory map
*/
#define IXDP2X00_PHYS_CPLD_BASE 0xc7000000
* On board CPLD memory map
*/
#define IXDP2X00_PHYS_CPLD_BASE 0xc7000000
-#define IXDP2X00_VIRT_CPLD_BASE 0xf
afff
000
-#define IXDP2X00_CPLD_SIZE 0x00
001
000
+#define IXDP2X00_VIRT_CPLD_BASE 0xf
e000
000
+#define IXDP2X00_CPLD_SIZE 0x00
100
000
#define IXDP2X00_CPLD_REG(x) \
#define IXDP2X00_CPLD_REG(x) \
@@
-72,12
+72,11
@@
#ifndef __ASSEMBLY__
/*
#ifndef __ASSEMBLY__
/*
- * Master NPU will always have flash and be PCI master.
- * Slave NPU may or may not have flash but will never be PCI master.
+ * The master NPU is always PCI master.
*/
static inline unsigned int ixdp2x00_master_npu(void)
{
*/
static inline unsigned int ixdp2x00_master_npu(void)
{
- return
((ixp2000_has_flash()) && (ixp2000_is_pcimaster())
);
+ return
!!ixp2000_is_pcimaster(
);
}
/*
}
/*