diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-01 21:50:01 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@ppcg5.localdomain> | 2010-03-01 22:21:58 +1100 |
| commit | 8edb381d6705811b278527907a5ae2a9c4db8074 (patch) | |
| tree | 3e9c0c6474eba65cfafc2652c49be002ae76a493 /drivers/gpu/drm/nouveau | |
| parent | 55a5cb5d594c18b3147a2288b00ea359c1a38cf8 (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')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 5 |
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 *); extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size); /* nouveau_acpi.c */ +#if defined(CONFIG_VGA_SWITCHEROO) void nouveau_register_dsm_handler(void); void nouveau_unregister_dsm_handler(void); +#else +static inline void nouveau_register_dsm_handler(void) {} +static inline void nouveau_unregister_dsm_handler(void) {} +#endif /* nouveau_backlight.c */ #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT |