aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-05-21 01:41:20 -0400
committerDave Airlie <airlied@redhat.com>2010-05-21 01:41:20 -0400
commit5d9b7e2d2db95549aeab129c95d588236137a4c8 (patch)
treed4a6257fc2761c7dbf063381cffb61cf16438372 /drivers
parente86527533586259875f08fccb173e3347046cc3f (diff)
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>
Diffstat (limited to 'drivers')
-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
60 select FW_LOADER 60 select FW_LOADER
61 select DRM_KMS_HELPER 61 select DRM_KMS_HELPER
62 select DRM_TTM 62 select DRM_TTM
63 select POWER_SUPPLY
63 help 64 help
64 Choose this option if you have an ATI Radeon graphics card. There 65 Choose this option if you have an ATI Radeon graphics card. There
65 are both PCI and AGP versions. You don't need to choose this to 66 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 @@
1config DRM_RADEON_KMS 1config DRM_RADEON_KMS
2 bool "Enable modesetting on radeon by default - NEW DRIVER" 2 bool "Enable modesetting on radeon by default - NEW DRIVER"
3 depends on DRM_RADEON 3 depends on DRM_RADEON
4 depends on POWER_SUPPLY
5 help 4 help
6 Choose this option if you want kernel modesetting enabled by default. 5 Choose this option if you want kernel modesetting enabled by default.
7 6