aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-03 09:20:25 +1000
committerDave Airlie <airlied@redhat.com>2010-03-03 09:20:25 +1000
commit2f41a7f11c4bb93c41715008a693cadaee5efd82 (patch)
treee67998bd986f08bfae754709cc2dc8c5fae3a170 /drivers
parent9b11fe5f4902c3f26b0d7d9ad5bd46eae624cf32 (diff)
downloadmrst-s0i3-test-2f41a7f11c4bb93c41715008a693cadaee5efd82.tar.gz
mrst-s0i3-test-2f41a7f11c4bb93c41715008a693cadaee5efd82.tar.xz
mrst-s0i3-test-2f41a7f11c4bb93c41715008a693cadaee5efd82.zip
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')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h2
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 f5b3cbe7dc8..5f8d987af36 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 *);
extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size);
/* nouveau_acpi.c */
-#if defined(CONFIG_VGA_SWITCHEROO)
+#if defined(CONFIG_ACPI)
void nouveau_register_dsm_handler(void);
void nouveau_unregister_dsm_handler(void);
#else