diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-19 14:33:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-19 14:33:10 -0500 |
| commit | eae34c67940f2a71837ed30d571b93572186d46b (patch) | |
| tree | 8bfb4a473601e8d87eadd8bf4f66cf3122be35c7 /drivers/pci/hotplug/acpiphp.h | |
| parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) | |
| parent | 3e3d0e9246d0eccc1da800348fc1b9199ae3d768 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI hotplug: ibmphp: Fix module ref count underflow
PCI hotplug: acpiphp wants a 64-bit _SUN
PCI: pciehp: fix unexpected power off with pciehp_force
PCI: fix aer resume sanity check
Diffstat (limited to 'drivers/pci/hotplug/acpiphp.h')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index f9e244da30ae..9bcb6cbd5aa9 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h | |||
| @@ -113,7 +113,7 @@ struct acpiphp_slot { | |||
| 113 | 113 | ||
| 114 | u8 device; /* pci device# */ | 114 | u8 device; /* pci device# */ |
| 115 | 115 | ||
| 116 | u32 sun; /* ACPI _SUN (slot unique number) */ | 116 | unsigned long long sun; /* ACPI _SUN (slot unique number) */ |
| 117 | u32 flags; /* see below */ | 117 | u32 flags; /* see below */ |
| 118 | }; | 118 | }; |
| 119 | 119 | ||