aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-01 05:50:01 -0500
committerDave Airlie <airlied@ppcg5.localdomain>2010-03-01 06:21:58 -0500
commit8edb381d6705811b278527907a5ae2a9c4db8074 (patch)
tree3e9c0c6474eba65cfafc2652c49be002ae76a493 /drivers/gpu/drm/nouveau/nouveau_drv.h
parent55a5cb5d594c18b3147a2288b00ea359c1a38cf8 (diff)
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/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index a2e24f252e84..f5b3cbe7dc80 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -852,8 +852,13 @@ extern int nouveau_dma_init(struct nouveau_channel *);
852extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size); 852extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size);
853 853
854/* nouveau_acpi.c */ 854/* nouveau_acpi.c */
855#if defined(CONFIG_VGA_SWITCHEROO)
855void nouveau_register_dsm_handler(void); 856void nouveau_register_dsm_handler(void);
856void nouveau_unregister_dsm_handler(void); 857void nouveau_unregister_dsm_handler(void);
858#else
859static inline void nouveau_register_dsm_handler(void) {}
860static inline void nouveau_unregister_dsm_handler(void) {}
861#endif
857 862
858/* nouveau_backlight.c */ 863/* nouveau_backlight.c */
859#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT 864#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT