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 /drivers/acpi | |
| parent | c2e2ceeae4b5587d412c05cdc31513179d37811d (diff) | |
| parent | 355d7f370b51bbb6f31aaf9f98861057e1e6bbb2 (diff) | |
| download | linux-3.10-56a50adda49b2020156616c4eb15353e0f9ad7de.tar.gz linux-3.10-56a50adda49b2020156616c4eb15353e0f9ad7de.tar.bz2 linux-3.10-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 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 1705d947ea0..d7ff61c0d57 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -2296,7 +2296,7 @@ static int __init acpi_video_init(void) return acpi_video_register(); } -static void __exit acpi_video_exit(void) +void __exit acpi_video_exit(void) { acpi_bus_unregister_driver(&acpi_video_bus); @@ -2305,6 +2305,7 @@ static void __exit acpi_video_exit(void) return; } +EXPORT_SYMBOL(acpi_video_exit); module_init(acpi_video_init); module_exit(acpi_video_exit); |