projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b11fe5
)
drm/nouveau: fix *staging* driver build with switcheroo off.
author
Dave Airlie
<airlied@redhat.com>
Tue, 2 Mar 2010 23:20:25 +0000
(09:20 +1000)
committer
Dave 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
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_drv.h
b/drivers/gpu/drm/nouveau/nouveau_drv.h
index
f5b3cbe
..
5f8d987
100644
(file)
--- 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