patch-2.4.0-test3 linux/include/asm-mips64/sn/klconfig.h

• Lines: 51
• Date: Sun Jul 9 22:18:15 2000
• Orig file: v2.4.0-test2/linux/include/asm-mips64/sn/klconfig.h
• Orig date: Tue May 23 15:31:36 2000

diff -u --recursive --new-file v2.4.0-test2/linux/include/asm-mips64/sn/klconfig.h linux/include/asm-mips64/sn/klconfig.h
@@ -32,35 +32,37 @@
  *      that offsets of existing fields do not change.
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <asm/sn/types.h>
-#if defined(CONFIG_SGI_IP27) || defined(CONFIG_SGI_IP35)
-#include <asm/sn/agent.h>
-#include <asm/arc/types.h>
-#include <asm/arc/hinv.h>
-#endif /* !CONFIG_SGI_IP27 || !CONFIG_SGI_IP35 */
 #if defined(CONFIG_SGI_IP27)
 #include <asm/sn/sn0/addrs.h>
 //#include <sys/SN/router.h>
 // XXX Stolen from <sys/SN/router.h>:
 #define MAX_ROUTER_PORTS (6)    /* Max. number of ports on a router */
 #include <asm/sn/sn0/sn0_fru.h>
+#include <asm/sn/agent.h>
 //#include <sys/graph.h>
+#include <asm/arc/types.h>
+#include <asm/arc/hinv.h>
 //#include <sys/xtalk/xbow.h>
+#if defined(CONFIG_SGI_IO)
+// The hack file has to be before vector and after sn0_fru....
+#include <asm/hack.h>
+#include <asm/sn/vector.h>
+#include <asm/xtalk/xtalk.h>
+#endif  /* CONFIG_SGI_IO */
 #elif defined(CONFIG_SGI_IP35)
+#include <asm/hack.h>
 #include <asm/sn/sn1/addrs.h>
+#include <asm/sn/vector.h>
 #include <sys/sn/router.h>
+#include <asm/sn/agent.h>
 #include <sys/graph.h>
+#include <asm/arc/types.h>
+#include <asm/arc/hinv.h>
 #include <asm/xtalk/xbow.h>
-#endif  /* !CONFIG_SGI_IP27 && !CONFIG_SGI_IP35 */
-#if (defined(CONFIG_SGI_IP27) && defined(CONFIG_SGI_IO)) || \
-     defined(CONFIG_SGI_IP35)
-// The hack file has to be before vector and after sn0_fru....
-#include <asm/hack.h>
-#include <asm/sn/vector.h>
 #include <asm/xtalk/xtalk.h>
-#endif  /* !(CONFIG_SGI_IP27 && CONFIG_SGI_IO) || !CONFIG_SGI_IP35 */
+#endif  /* !CONFIG_SGI_IP27 && !CONFIG_SGI_IP35 */
 
 #define KLCFGINFO_MAGIC	0xbeedbabe