diff options
| author | Len Brown <len.brown@intel.com> | 2010-01-20 01:23:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-01-20 01:23:27 -0500 |
| commit | be6066f34c948ccf4adcc90bbeb1fd335d663303 (patch) | |
| tree | 551d2cf4934e7101e2e668347d85f47663a77e7c /drivers/acpi/pci_root.c | |
| parent | b4cdd6ac4f9b73118542a5c4e796e6b9f287d0dd (diff) | |
| parent | 7f07a605a3929d2d94dcbad8ccb7d280958d21f9 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 101cce3681d1..64f55b6db73c 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
| @@ -46,7 +46,7 @@ static int acpi_pci_root_add(struct acpi_device *device); | |||
| 46 | static int acpi_pci_root_remove(struct acpi_device *device, int type); | 46 | static int acpi_pci_root_remove(struct acpi_device *device, int type); |
| 47 | static int acpi_pci_root_start(struct acpi_device *device); | 47 | static int acpi_pci_root_start(struct acpi_device *device); |
| 48 | 48 | ||
| 49 | static struct acpi_device_id root_device_ids[] = { | 49 | static const struct acpi_device_id root_device_ids[] = { |
| 50 | {"PNP0A03", 0}, | 50 | {"PNP0A03", 0}, |
| 51 | {"", 0}, | 51 | {"", 0}, |
| 52 | }; | 52 | }; |