diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
| commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
| tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /drivers/acpi/video_detect.c | |
| parent | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff) | |
| parent | e55a5999ffcf72dc4d43d73618957964cb87065a (diff) | |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/video_detect.c')
| -rw-r--r-- | drivers/acpi/video_detect.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index 7cd2b63435ea..7032f25da9b5 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c | |||
| @@ -38,6 +38,8 @@ | |||
| 38 | #include <linux/dmi.h> | 38 | #include <linux/dmi.h> |
| 39 | #include <linux/pci.h> | 39 | #include <linux/pci.h> |
| 40 | 40 | ||
| 41 | #define PREFIX "ACPI: " | ||
| 42 | |||
| 41 | ACPI_MODULE_NAME("video"); | 43 | ACPI_MODULE_NAME("video"); |
| 42 | #define _COMPONENT ACPI_VIDEO_COMPONENT | 44 | #define _COMPONENT ACPI_VIDEO_COMPONENT |
| 43 | 45 | ||