diff --git a/[refs] b/[refs]
index ea9a2a9f3c60..493d64b8add4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b11fe5f4902c3f26b0d7d9ad5bd46eae624cf32
+refs/heads/master: 2f41a7f11c4bb93c41715008a693cadaee5efd82
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
index f5b3cbe7dc80..5f8d987af363 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/trunk/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