diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-02 18:20:25 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-02 18:20:25 -0500 |
| commit | 2f41a7f11c4bb93c41715008a693cadaee5efd82 (patch) | |
| tree | e67998bd986f08bfae754709cc2dc8c5fae3a170 /drivers/gpu/drm/nouveau | |
| parent | 9b11fe5f4902c3f26b0d7d9ad5bd46eae624cf32 (diff) | |
drm/nouveau: fix *staging* driver build with switcheroo off.
This driver is in *staging*. Fix the build with the switcheroo off.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index f5b3cbe7dc80..5f8d987af363 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
| @@ -852,7 +852,7 @@ extern int nouveau_dma_init(struct nouveau_channel *); | |||
| 852 | extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size); | 852 | extern 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) | 855 | #if defined(CONFIG_ACPI) |
| 856 | void nouveau_register_dsm_handler(void); | 856 | void nouveau_register_dsm_handler(void); |
| 857 | void nouveau_unregister_dsm_handler(void); | 857 | void nouveau_unregister_dsm_handler(void); |
| 858 | #else | 858 | #else |