diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:40:06 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:40:06 -0400 |
| commit | 12648810506eaa063dc23b66514fbb4796f34312 (patch) | |
| tree | 4cd16290c9e1350d946a92ca8d5624cdd683b739 /include/acpi | |
| parent | 7329e9356e5b46e11a1781dff2dc64c2e3284884 (diff) | |
| parent | 03ae61dd5701092aabb60a8cae9929dbf8dc25c6 (diff) | |
| download | linux-3.10-12648810506eaa063dc23b66514fbb4796f34312.tar.gz linux-3.10-12648810506eaa063dc23b66514fbb4796f34312.tar.bz2 linux-3.10-12648810506eaa063dc23b66514fbb4796f34312.zip | |
Merge branch 'video' into release
Conflicts:
drivers/acpi/video.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/video.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/acpi/video.h b/include/acpi/video.h new file mode 100644 index 00000000000..f0275bb79ce --- /dev/null +++ b/include/acpi/video.h @@ -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 + |