--- linux/include/linux/swap.h	Fri Jan 23 08:30:29 2004
+++ linux-new/include/linux/swap.h	Mon Mar  1 09:10:44 2004
@@ -1,6 +1,12 @@
 #ifndef _LINUX_SWAP_H
 #define _LINUX_SWAP_H
 
+#include <linux/config.h>
+
+#define MAX_SWAPFILES 32
+
+#ifdef __KERNEL__
+
 #include <linux/spinlock.h>
 #include <asm/page.h>
 
@@ -8,8 +14,6 @@
 #define SWAP_FLAG_PRIO_MASK	0x7fff
 #define SWAP_FLAG_PRIO_SHIFT	0
 
-#define MAX_SWAPFILES 32
-
 /*
  * Magic header for a swap area. The first part of the union is
  * what the swap magic looks like for the old (limited to 128MB)
@@ -38,8 +42,6 @@
 		unsigned int badpages[1];
 	} info;
 };
-
-#ifdef __KERNEL__
 
 /*
  * Max bad pages in the new format..