diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 15:45:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 16:04:05 +1100 |
| commit | 14eb35e053d21fed280e07bcba127cd54adcc920 (patch) | |
| tree | acdf790c7a6296e9dcb212ea559a1a1f0cafd5f2 /drivers/acpi/pci_root.c | |
| parent | ea326b4b683898224938e6a7f6bcd1000e1c68b3 (diff) | |
| parent | 7d1e85d91ec9f6101a5f0514946594f6783c0c4a (diff) | |
Merge commit 'acpi/test'
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
drivers/acpi/Kconfig
drivers/acpi/scan.c
drivers/pnp/Makefile
drivers/pnp/quirks.c
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index c3fed31166b5..1b8f67d21d53 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -190,7 +190,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) struct acpi_pci_root *root = NULL; struct acpi_pci_root *tmp; acpi_status status = AE_OK; - unsigned long value = 0; + unsigned long long value = 0; acpi_handle handle = NULL; struct acpi_device *child; @@ -206,7 +206,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) root->device = device; strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); - acpi_driver_data(device) = root; + device->driver_data = root; device->ops.bind = acpi_pci_bind; |