diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 11:22:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 11:22:54 +0000 |
| commit | a1926d1745114789687ac029ae8c58944b7d2256 (patch) | |
| tree | c303e75615e378451a80b97bfd2c1ba54029d9bb /include/acpi/video.h | |
| parent | 492e917635a0fa05439bb562fd51577efc9cef30 (diff) | |
| parent | 52fc43f7c1c416b114e88ff39635c36e67ef15b6 (diff) | |
| download | kernel_samsung_espresso10-a1926d1745114789687ac029ae8c58944b7d2256.zip kernel_samsung_espresso10-a1926d1745114789687ac029ae8c58944b7d2256.tar.gz kernel_samsung_espresso10-a1926d1745114789687ac029ae8c58944b7d2256.tar.bz2 | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'include/acpi/video.h')
| -rw-r--r-- | include/acpi/video.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/acpi/video.h b/include/acpi/video.h index 551793c..0e98e67 100644 --- a/include/acpi/video.h +++ b/include/acpi/video.h @@ -1,6 +1,10 @@ #ifndef __ACPI_VIDEO_H #define __ACPI_VIDEO_H +#include <linux/errno.h> /* for ENODEV */ + +struct acpi_device; + #define ACPI_VIDEO_DISPLAY_CRT 1 #define ACPI_VIDEO_DISPLAY_TV 2 #define ACPI_VIDEO_DISPLAY_DVI 3 @@ -26,4 +30,3 @@ static inline int acpi_video_get_edid(struct acpi_device *device, int type, #endif #endif - |