Merge branch 'video' into release

Conflicts:
	drivers/acpi/video.c

Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
Len Brown 2009-04-05 01:40:06 -04:00
commit 1264881050
7 changed files with 306 additions and 63 deletions

11
include/acpi/video.h Normal file
View file

@ -0,0 +1,11 @@
#ifndef __ACPI_VIDEO_H
#define __ACPI_VIDEO_H
#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
extern int acpi_video_register(void);
#else
static inline int acpi_video_register(void) { return 0; }
#endif
#endif