[PATCH] move CONFIG_SWAP around

Patch from Tom Rini <trini@kernel.crashing.org>

Take CONFIG_SWAP out of the top-level menu into the general setup menu.  Make
it dependent on CONFIG_MMU and common to all architectures.

arch/alpha/Kconfig

@@ -15,10 +15,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 

arch/arm/Kconfig

@@ -20,10 +20,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config EISA
 	bool
 	---help---

arch/cris/Kconfig

@@ -9,10 +9,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y

arch/i386/Kconfig

@@ -18,15 +18,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool "Support for paging of anonymous memory"
-	default y
-	help
-	  This option allows you to choose whether you want to have support
-	  for socalled swap devices or swap files in your kernel that are
-	  used to provide more virtual memory than the actual RAM present
-	  in your computer.  If unusre say Y.
-
 config SBUS
 	bool
 

arch/ia64/Kconfig

@@ -22,10 +22,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config RWSEM_XCHGADD_ALGORITHM
 	bool
 	default y

arch/m68k/Kconfig

@@ -10,10 +10,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y

arch/m68knommu/Kconfig

@@ -9,10 +9,6 @@ config MMU
 	bool
 	default n
 
-config SWAP
-	bool
-	default n
-
 config FPU
 	bool
 	default n

arch/mips/Kconfig

@@ -10,10 +10,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config SMP
 	bool
 	---help---

arch/mips64/Kconfig

@@ -9,10 +9,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 source "init/Kconfig"
 
 

arch/parisc/Kconfig

@@ -18,10 +18,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config STACK_GROWSUP
 	bool
 	default y

arch/ppc/Kconfig

@@ -1126,22 +1126,6 @@ config BOOT_LOAD
 config PIN_TLB
 	bool "Pinned Kernel TLBs (860 ONLY)"
 	depends on ADVANCED_OPTIONS && 8xx
-
-config SWAP
-	bool "Enable support for swap"
-	depends on ADVANCED_OPTIONS
-	help
-	  This option allows you to turn off support for swapfiles in
-	  the kernel.  This can be useful if you know that your system
-	  will never have swap.
-
-	  Say Y here unless you know what you are doing.
-
-config SWAP
-	bool
-	depends on !ADVANCED_OPTIONS
-	default y
-
 endmenu
 
 source "drivers/mtd/Kconfig"

arch/ppc64/Kconfig

@@ -7,10 +7,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 

arch/s390/Kconfig

@@ -7,10 +7,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y

arch/s390x/Kconfig

@@ -7,10 +7,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config RWSEM_GENERIC_SPINLOCK
 	bool
 

arch/sh/Kconfig

@@ -18,10 +18,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y

arch/sparc/Kconfig

@@ -9,10 +9,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y

arch/sparc64/Kconfig

@@ -9,10 +9,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 source "init/Kconfig"
 
 

arch/um/Kconfig

@@ -7,10 +7,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 mainmenu "Linux/Usermode Kernel Configuration"
 
 config ISA

arch/v850/Kconfig

@@ -10,9 +10,6 @@ mainmenu "uClinux/v850 (w/o MMU) Kernel Configuration"
 config MMU
        	bool
 	default n
-config SWAP
-	bool
-	default n
 config UID16
 	bool
 	default n

arch/x86_64/Kconfig

@@ -24,10 +24,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config ISA
 	bool
 

init/Kconfig

@@ -37,6 +37,16 @@ endmenu
 
 menu "General setup"
 
+config SWAP
+	bool "Support for paging of anonymous memory"
+	depends on MMU
+	default y
+	help
+	  This option allows you to choose whether you want to have support
+	  for socalled swap devices or swap files in your kernel that are
+	  used to provide more virtual memory than the actual RAM present
+	  in your computer.  If unusre say Y.
+
 config SYSVIPC
 	bool "System V IPC"
 	---help---