diff options
Diffstat (limited to 'drivers/acpi/video_detect.c')
| -rw-r--r-- | drivers/acpi/video_detect.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index 09737275e25f..7cd2b63435ea 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | * assinged | 10 | * assinged |
| 11 | * | 11 | * |
| 12 | * After PCI devices are glued with ACPI devices | 12 | * After PCI devices are glued with ACPI devices |
| 13 | * acpi_get_physical_pci_device() can be called to identify ACPI graphics | 13 | * acpi_get_pci_dev() can be called to identify ACPI graphics |
| 14 | * devices for which a real graphics card is plugged in | 14 | * devices for which a real graphics card is plugged in |
| 15 | * | 15 | * |
| 16 | * Now acpi_video_get_capabilities() can be called to check which | 16 | * Now acpi_video_get_capabilities() can be called to check which |
| @@ -36,6 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | #include <linux/acpi.h> | 37 | #include <linux/acpi.h> |
| 38 | #include <linux/dmi.h> | 38 | #include <linux/dmi.h> |
| 39 | #include <linux/pci.h> | ||
| 39 | 40 | ||
| 40 | ACPI_MODULE_NAME("video"); | 41 | ACPI_MODULE_NAME("video"); |
| 41 | #define _COMPONENT ACPI_VIDEO_COMPONENT | 42 | #define _COMPONENT ACPI_VIDEO_COMPONENT |
| @@ -109,7 +110,7 @@ static acpi_status | |||
| 109 | find_video(acpi_handle handle, u32 lvl, void *context, void **rv) | 110 | find_video(acpi_handle handle, u32 lvl, void *context, void **rv) |
| 110 | { | 111 | { |
| 111 | long *cap = context; | 112 | long *cap = context; |
| 112 | struct device *dev; | 113 | struct pci_dev *dev; |
| 113 | struct acpi_device *acpi_dev; | 114 | struct acpi_device *acpi_dev; |
| 114 | 115 | ||
| 115 | const struct acpi_device_id video_ids[] = { | 116 | const struct acpi_device_id video_ids[] = { |
| @@ -120,10 +121,10 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
| 120 | return AE_OK; | 121 | return AE_OK; |
| 121 | 122 | ||
| 122 | if (!acpi_match_device_ids(acpi_dev, video_ids)) { | 123 | if (!acpi_match_device_ids(acpi_dev, video_ids)) { |
| 123 | dev = acpi_get_physical_pci_device(handle); | 124 | dev = acpi_get_pci_dev(handle); |
| 124 | if (!dev) | 125 | if (!dev) |
| 125 | return AE_OK; | 126 | return AE_OK; |
| 126 | put_device(dev); | 127 | pci_dev_put(dev); |
| 127 | *cap |= acpi_is_video_device(acpi_dev); | 128 | *cap |= acpi_is_video_device(acpi_dev); |
| 128 | } | 129 | } |
| 129 | return AE_OK; | 130 | return AE_OK; |
