summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-05-21 07:41:20 +0200
committerDave Airlie <airlied@redhat.com>2010-05-21 07:41:20 +0200
commit5d9b7e2d2db95549aeab129c95d588236137a4c8 (patch)
treed4a6257fc2761c7dbf063381cffb61cf16438372
parentdrm/radeon/kms: record object that have been list reserved (diff)
downloadlinux-5d9b7e2d2db95549aeab129c95d588236137a4c8.tar.xz
linux-5d9b7e2d2db95549aeab129c95d588236137a4c8.zip
drm/radeon: fix power supply kconfig interaction.
radeon needs power supply to get correct PM info so select it at the radeon level not at the kms option. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/Kconfig1
-rw-r--r--drivers/gpu/drm/radeon/Kconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 2583ddfcc33e..88910e5a2c77 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -60,6 +60,7 @@ config DRM_RADEON
select FW_LOADER
select DRM_KMS_HELPER
select DRM_TTM
+ select POWER_SUPPLY
help
Choose this option if you have an ATI Radeon graphics card. There
are both PCI and AGP versions. You don't need to choose this to
diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig
index 80c5b3ea28b4..1c02d23f6fcc 100644
--- a/drivers/gpu/drm/radeon/Kconfig
+++ b/drivers/gpu/drm/radeon/Kconfig
@@ -1,7 +1,6 @@
config DRM_RADEON_KMS
bool "Enable modesetting on radeon by default - NEW DRIVER"
depends on DRM_RADEON
- depends on POWER_SUPPLY
help
Choose this option if you want kernel modesetting enabled by default.