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 e017826..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
-#define IXDP2X00_VIRT_CPLD_BASE                0xfefdd000
-#define IXDP2X00_CPLD_SIZE             0x00001000
+#define IXDP2X00_VIRT_CPLD_BASE                0xfe000000
+#define IXDP2X00_CPLD_SIZE             0x00100000
 
 
 #define IXDP2X00_CPLD_REG(x)   \
@@ -53,7 +53,7 @@
 
 /*
  * PCI devfns for on-board devices. We need these to be able to
- * properly translte IRQs and for device removal.
+ * properly translate IRQs and for device removal.
  */
 #define        IXDP2400_SLAVE_ENET_DEVFN       0x18    /* Bus 1 */
 #define        IXDP2400_MASTER_ENET_DEVFN      0x20    /* Bus 1 */
@@ -72,12 +72,11 @@
 
 #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)
 {
-       return ((ixp2000_has_flash()) && (ixp2000_is_pcimaster()));
+       return !!ixp2000_is_pcimaster();
 }
 
 /*