From 5aec084d8fd2c42cfcd69a9d7a104ff27c365a4f Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 17 May 2010 10:54:04 -0700 Subject: [PATCH] --- yaml --- r: 196490 b: refs/heads/master c: ca117d6df95a8f809d37d74c2d715ec3c8c3a4ed h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/vga/Kconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0138312a9e84..dc27240b41d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bcad4c95eb4a017029ab82c2c9dee4198503aef +refs/heads/master: ca117d6df95a8f809d37d74c2d715ec3c8c3a4ed diff --git a/trunk/drivers/gpu/vga/Kconfig b/trunk/drivers/gpu/vga/Kconfig index 61ab4daf0bbb..8d0e31a22027 100644 --- a/trunk/drivers/gpu/vga/Kconfig +++ b/trunk/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.