Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[cascardo/linux.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index d4f7a6a..c51efdc 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -13,6 +13,7 @@ config SPARC
        bool
        default y
        select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI
+       select ARCH_MIGHT_HAVE_PC_SERIO
        select OF
        select OF_PROMTREE
        select HAVE_IDE
@@ -152,10 +153,10 @@ config SMP
          a system with only one CPU, say N. If you have a system with more
          than one CPU, say Y.
 
-         If you say N here, the kernel will run on single and multiprocessor
+         If you say N here, the kernel will run on uni- and multiprocessor
          machines, but will use only one CPU of a multiprocessor machine. If
          you say Y here, the kernel will run on many, but not all,
-         singleprocessor machines. On a singleprocessor machine, the kernel
+         uniprocessor machines. On a uniprocessor machine, the kernel
          will run faster if you say N here.
 
          People using multiprocessor machines who say Y here should also say