Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6

[~andy/linux] / include / acpi / video.h

diff --git a/include/acpi/video.h b/include/acpi/video.h
index af6fe95fd3d004e88e0d2cafa63c682a611e687e..cf7be3dd157bec5572a2b9f3220e4e1274d5f27b 100644 (file)
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
@@ -3,10 +3,10 @@
 
 #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
 extern int acpi_video_register(void);
-extern int acpi_video_exit(void);
+extern void acpi_video_unregister(void);
 #else
 static inline int acpi_video_register(void) { return 0; }
-static inline void acpi_video_exit(void) { return; }
+static inline void acpi_video_unregister(void) { return; }
 #endif
 
 #endif