summaryrefslogtreecommitdiff
path: root/drivers/gpu/vga/Kconfig
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-01-23 17:24:26 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-24 23:45:32 +0000
commitbdd92c9ad287e03a2ec52f5a89c470cd5caae1c2 (patch)
tree38d863507e900fb2ccac4c22fcf8934271c051b5 /drivers/gpu/vga/Kconfig
parenta37f2f87edc1b6e5932becf6e51535d36b690f2a (diff)
parent8e934dbf264418afe4d1dff34ce074ecc14280db (diff)
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge important suspend and resume regression fixes and resolve the small conflict. Conflicts: drivers/gpu/drm/i915/i915_dma.c
Diffstat (limited to 'drivers/gpu/vga/Kconfig')
-rw-r--r--drivers/gpu/vga/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 8d0e31a22027..96c83a9a76bb 100644
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -1,5 +1,5 @@
config VGA_ARB
- bool "VGA Arbitration" if EMBEDDED
+ bool "VGA Arbitration" if EXPERT
default y
depends on PCI
help