Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / gpu / vga / Kconfig

diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 61ab4da..8d0e31a 100644 (file)
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -18,12 +18,12 @@ config VGA_ARB_MAX_GPUS
          multiple GPUS.  The overhead for each GPU is very small.
 
 config VGA_SWITCHEROO
-       bool "Laptop Hybrid Grapics - GPU switching support"
+       bool "Laptop Hybrid Graphics - GPU switching support"
        depends on X86
        depends on ACPI
        help
-         Many laptops released in 2008/9/10 have two gpus with a multiplxer
+         Many laptops released in 2008/9/10 have two GPUs with a multiplexer
          to switch between them. This adds support for dynamic switching when
           X isn't running and delayed switching until the next logoff. This
-         features is called hybrid graphics, ATI PowerXpress, and Nvidia
+         feature is called hybrid graphics, ATI PowerXpress, and Nvidia
          HybridPower.