summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_atpx_handler.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-04-25 10:04:22 +0200
committerIngo Molnar <mingo@kernel.org>2014-04-25 10:04:22 +0200
commit42ebd27bcbda7895fa07c61185a26d8379945ed0 (patch)
tree51be64b0c2c0defd1a0ce3e6d55452dbd8a7aaae /drivers/gpu/drm/radeon/radeon_atpx_handler.c
parenta81fef347b32dea2b31275826afe1c93fa0d2d54 (diff)
parent9f7ff8931e3c5ddc8535476971ec9501e9555c05 (diff)
downloadblackbird-op-linux-42ebd27bcbda7895fa07c61185a26d8379945ed0.tar.gz
blackbird-op-linux-42ebd27bcbda7895fa07c61185a26d8379945ed0.zip
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_atpx_handler.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_atpx_handler.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index fa9a9c02751e..dedea72f48c4 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -59,7 +59,7 @@ struct atpx_mux {
u16 mux;
} __packed;
-bool radeon_is_px(void) {
+bool radeon_has_atpx(void) {
return radeon_atpx_priv.atpx_detected;
}
OpenPOWER on IntegriCloud