From: Tom 'spot' Callaway <tcallawa@redhat.com>

This patch changes the name of the sparc32 Kconfig menu from "General
Setup" to "General Machine Setup", to match the changes committed to most
other arches in 2.6.9-rc1.

Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/sparc/Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/sparc/Kconfig~keep-sparc32-config-consistent arch/sparc/Kconfig
--- 25/arch/sparc/Kconfig~keep-sparc32-config-consistent	2004-08-24 17:27:06.571522024 -0700
+++ 25-akpm/arch/sparc/Kconfig	2004-08-24 17:27:06.574521568 -0700
@@ -23,7 +23,7 @@ config GENERIC_ISA_DMA
 
 source "init/Kconfig"
 
-menu "General setup"
+menu "General machine setup"
 
 config VT
 	bool
_