summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/radeon_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-01 13:50:01 +0300
committerDave Airlie <airlied@ppcg5.localdomain>2010-03-01 14:21:58 +0300
commit8edb381d6705811b278527907a5ae2a9c4db8074 (patch)
tree3e9c0c6474eba65cfafc2652c49be002ae76a493 /drivers/gpu/drm/radeon/radeon_drv.h
parent55a5cb5d594c18b3147a2288b00ea359c1a38cf8 (diff)
downloadlinux-8edb381d6705811b278527907a5ae2a9c4db8074.tar.xz
vga_switcheroo: fix build on platforms with no ACPI
radeon was always including the atpx code unnecessarily, also core switcheroo was including acpi headers. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.h')
-rw-r--r--drivers/gpu/drm/radeon/radeon_drv.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 4fe16461bb1b..ec55f2b23c22 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -463,8 +463,14 @@ extern void r600_blit_swap(struct drm_device *dev,
int w, int h, int src_pitch, int dst_pitch, int cpp);
/* atpx handler */
+#if defined(CONFIG_VGA_SWITCHEROO)
void radeon_register_atpx_handler(void);
void radeon_unregister_atpx_handler(void);
+#else
+static inline void radeon_register_atpx_handler(void) {}
+static inline void radeon_unregister_atpx_handler(void) {}
+#endif
+
/* Flags for stats.boxes
*/
#define RADEON_BOX_DMA_IDLE 0x1