diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-28 17:21:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-28 17:21:20 -0700 |
| commit | 56a50adda49b2020156616c4eb15353e0f9ad7de (patch) | |
| tree | a0453fde37538653628270258c3291d880a66853 /include/acpi | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff) | |
| parent | drm/i915: fix up error path leak in i915_cmdbuffer (diff) | |
| download | linux-dev-56a50adda49b2020156616c4eb15353e0f9ad7de.tar.xz linux-dev-56a50adda49b2020156616c4eb15353e0f9ad7de.zip | |
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
* 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
drm/i915: fix up error path leak in i915_cmdbuffer
drm/i915: fix unpaired i915 device mutex on entervt failure.
drm/i915: add support for G41 chipset
drm/i915: Enable ASLE if present
drm/i915: Unregister ACPI video driver when exiting
drm/i915: Register ACPI video even when not modesetting
drm/i915: fix transition to I915_TILING_NONE
drm/i915: Don't let an oops get triggered from irq_emit without dma init.
drm/i915: allow tiled front buffers on 965+
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/video.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/video.h b/include/acpi/video.h index f0275bb79ce4..af6fe95fd3d0 100644 --- a/include/acpi/video.h +++ b/include/acpi/video.h @@ -3,8 +3,10 @@ #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) extern int acpi_video_register(void); +extern int acpi_video_exit(void); #else static inline int acpi_video_register(void) { return 0; } +static inline void acpi_video_exit(void) { return; } #endif #endif |