diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /drivers/pci/hotplug/pciehp.h | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
| -rw-r--r-- | drivers/pci/hotplug/pciehp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index f313121d5141..46b294a12418 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
| @@ -130,6 +130,7 @@ struct controller { | |||
| 130 | u8 slot_bus; /* Bus where the slots handled by this controller sit */ | 130 | u8 slot_bus; /* Bus where the slots handled by this controller sit */ |
| 131 | u8 ctrlcap; | 131 | u8 ctrlcap; |
| 132 | u16 vendor_id; | 132 | u16 vendor_id; |
| 133 | u8 cap_base; | ||
| 133 | }; | 134 | }; |
| 134 | 135 | ||
| 135 | struct irq_mapping { | 136 | struct irq_mapping { |