]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/nouveau: fix *staging* driver build with switcheroo off.
authorDave Airlie <airlied@redhat.com>
Tue, 2 Mar 2010 23:20:25 +0000 (09:20 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 2 Mar 2010 23:20:25 +0000 (09:20 +1000)
This driver is in *staging*. Fix the build with the switcheroo off.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/nouveau/nouveau_drv.h

index f5b3cbe7dc80b80265dfc9e6b654fa8c6625e1e1..5f8d987af3631a7fb06e612ae800bcff57de8bae 100644 (file)
@@ -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