aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-02-26 05:08:45 -0500
committerPaul Mackerras <paulus@samba.org>2008-02-26 05:08:45 -0500
commitf8303dd3db57bd7ab2062985ad7a9e898a8ac423 (patch)
treeb92086100ed44c8647dba61a21e560923daa336a /arch/sparc64
parentbfa274e2436fc7ef72ef51c878083647f1cfd429 (diff)
parent74b20dad1c4cc0fd13ceca62fbab808919e1a7ea (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 3af378ddb6ae..b18d24d249fa 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -15,6 +15,7 @@ config SPARC64
15 bool 15 bool
16 default y 16 default y
17 select HAVE_IDE 17 select HAVE_IDE
18 select HAVE_LMB
18 help 19 help
19 SPARC is a family of RISC microprocessors designed and marketed by 20 SPARC is a family of RISC microprocessors designed and marketed by
20 Sun Microsystems, incorporated. This port covers the newer 64-bit 21 Sun Microsystems, incorporated. This port covers the newer 64-bit