diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
| commit | fb7899b1f0b748ef966071f5dc23c59ebd57d08f (patch) | |
| tree | 2f13f9d8607871a60334608524e8b4e9447f5309 /drivers/acpi/pci_root.c | |
| parent | 212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 (diff) | |
| parent | abe94c756c08d50566c09a65b9c7fe72f83071c5 (diff) | |
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
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 | }; |