summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/stub
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2011-02-01 11:17:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-02 10:18:42 +1100
commit69bc70d4f97ce82153bed0afc9f432700c60390b (patch)
tree2ee7e82ce2215cfadbc950cd8591d9b922801eb2 /drivers/gpu/stub
parentebf53826e105f488f4f628703a108e98940d1dc5 (diff)
downloadtalos-obmc-linux-69bc70d4f97ce82153bed0afc9f432700c60390b.tar.gz
talos-obmc-linux-69bc70d4f97ce82153bed0afc9f432700c60390b.zip
gpu/stub: fix acpi_video build error, fix stub kconfig dependencies
The comments under "config STUB_POULSBO" are close to correct, but they are not being followed. This patch updates them to reflect the requirements for THERMAL. This build error is caused by STUB_POULSBO selecting ACPI_VIDEO when ACPI_VIDEO's config requirements are not met. ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined! ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined! Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/gpu/stub')
-rw-r--r--drivers/gpu/stub/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/stub/Kconfig b/drivers/gpu/stub/Kconfig
index 09aea5f1556d..70e60a4bb678 100644
--- a/drivers/gpu/stub/Kconfig
+++ b/drivers/gpu/stub/Kconfig
@@ -1,11 +1,13 @@
config STUB_POULSBO
tristate "Intel GMA500 Stub Driver"
depends on PCI
+ depends on NET # for THERMAL
# Poulsbo stub depends on ACPI_VIDEO when ACPI is enabled
# but for select to work, need to select ACPI_VIDEO's dependencies, ick
select BACKLIGHT_CLASS_DEVICE if ACPI
select INPUT if ACPI
select ACPI_VIDEO if ACPI
+ select THERMAL if ACPI
help
Choose this option if you have a system that has Intel GMA500
(Poulsbo) integrated graphics. If M is selected, the module will
OpenPOWER on IntegriCloud