diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 02:14:45 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 02:14:45 -0400 |
| commit | d26f0528d588e596955bf296a609afe52eafc099 (patch) | |
| tree | 314f7a5637d5517a19f29d64a17e3459505def8f /drivers/acpi/video.c | |
| parent | b963bd39c9000328f6ce4f12aa52abbb0c68ee91 (diff) | |
| parent | df43176c934f2bc01f7615a6e20a4b8e77dcdd11 (diff) | |
Merge branch 'misc-2.6.32' into release
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/video.c')
| -rw-r--r-- | drivers/acpi/video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 9b578b53252d..902fd526f328 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <linux/pci.h> | 40 | #include <linux/pci.h> |
| 41 | #include <linux/pci_ids.h> | 41 | #include <linux/pci_ids.h> |
| 42 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
| 43 | 43 | #include <linux/dmi.h> | |
| 44 | #include <acpi/acpi_bus.h> | 44 | #include <acpi/acpi_bus.h> |
| 45 | #include <acpi/acpi_drivers.h> | 45 | #include <acpi/acpi_drivers.h> |
| 46 | 46 | ||