From e76beba9cab82fa38a11277af7d03fa63af325cd Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 21 May 2010 15:41:20 +1000 Subject: [PATCH] --- yaml --- r: 196563 b: refs/heads/master c: 5d9b7e2d2db95549aeab129c95d588236137a4c8 h: refs/heads/master i: 196561: f4dd0e918ca426ee5ac813eca5cbfb3f42627b69 196559: 45833bbf2b6118e907f27f8ac426c99a326ffb8d v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/Kconfig | 1 + trunk/drivers/gpu/drm/radeon/Kconfig | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1eecbfa9fdf4..628081798e47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e86527533586259875f08fccb173e3347046cc3f +refs/heads/master: 5d9b7e2d2db95549aeab129c95d588236137a4c8 diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig index 2583ddfcc33e..88910e5a2c77 100644 --- a/trunk/drivers/gpu/drm/Kconfig +++ b/trunk/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/trunk/drivers/gpu/drm/radeon/Kconfig b/trunk/drivers/gpu/drm/radeon/Kconfig index 80c5b3ea28b4..1c02d23f6fcc 100644 --- a/trunk/drivers/gpu/drm/radeon/Kconfig +++ b/trunk/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.