Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / asm-mips / sni.h

diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h
index b3bc698dfdeeca4e6629517813788881f06fa48f..b9ba54d0dd359ebd6bfabfd84da4dcf2e53b4d93 100644 (file)
--- a/include/asm-mips/sni.h
+++ b/include/asm-mips/sni.h
@@ -15,9 +15,6 @@
 /*
  * ASIC PCI registers for little endian configuration.
  */
-#ifndef __MIPSEL__
-#error "Fix me for big endian"
-#endif
 #define PCIMT_UCONF            0xbfff0000
 #define PCIMT_IOADTIMEOUT2     0xbfff0008
 #define PCIMT_IOMEMCONF                0xbfff0010
@@ -51,9 +48,9 @@
 #define PCIMT_PCI_CONF         0xbfff0100
 
 /*
- * Data port for the PCI bus.
+ * Data port for the PCI bus in IO space
  */
-#define PCIMT_CONFIG_DATA      0xb4000cfc
+#define PCIMT_CONFIG_DATA      0x0cfc
 
 /*
  * Board specific registers