diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 13:36:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 13:36:22 -0500 |
| commit | bc535154137601400ffe44c2a7be047ca041fe06 (patch) | |
| tree | 1b6ad05ec2a458d44a384aa90b2ef914c6ce4d52 /drivers/pci | |
| parent | d03ab7ff335b7fbf48d0fd28ead5d7957798510b (diff) | |
| parent | 439913fffd39374c3737186b22d2d56c3a0ae526 (diff) | |
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: replace acpi_integer by u64
ACPICA: Update version to 20100121.
ACPICA: Remove unused uint32_struct type
ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object
ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type
ACPICA: Predefined name repair: fix NULL package elements
ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls
ACPICA: Update all ACPICA copyrights and signons to 2010
ACPICA: Update for new gcc-4 warning options
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index c0c73913833d..2e7a3bf13824 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c | |||
| @@ -354,7 +354,7 @@ static struct pci_platform_pm_ops acpi_pci_platform_pm = { | |||
| 354 | static int acpi_pci_find_device(struct device *dev, acpi_handle *handle) | 354 | static int acpi_pci_find_device(struct device *dev, acpi_handle *handle) |
| 355 | { | 355 | { |
| 356 | struct pci_dev * pci_dev; | 356 | struct pci_dev * pci_dev; |
| 357 | acpi_integer addr; | 357 | u64 addr; |
| 358 | 358 | ||
| 359 | pci_dev = to_pci_dev(dev); | 359 | pci_dev = to_pci_dev(dev); |
| 360 | /* Please ref to ACPI spec for the syntax of _ADR */ | 360 | /* Please ref to ACPI spec for the syntax of _ADR */ |