diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-25 06:12:01 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-25 06:12:01 -0500 |
| commit | 26925c5910ab77fc95b4d8bb6d98780b50ab1e5a (patch) | |
| tree | 7d7506b3aedeea4db8b8659f046850db97503a89 /drivers/pci/hotplug/pciehp.h | |
| parent | 55bb239e5464ecde046af3e45052ef06efda6444 (diff) | |
| parent | cd0cca7bf5e201dcea5632f78ad9b37cb419a5df (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
| -rw-r--r-- | drivers/pci/hotplug/pciehp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index c42b68d3aa24..6a61b9f286e1 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
| @@ -59,7 +59,6 @@ struct slot { | |||
| 59 | struct slot *next; | 59 | struct slot *next; |
| 60 | u8 bus; | 60 | u8 bus; |
| 61 | u8 device; | 61 | u8 device; |
| 62 | u16 status; | ||
| 63 | u32 number; | 62 | u32 number; |
| 64 | u8 state; | 63 | u8 state; |
| 65 | struct timer_list task_event; | 64 | struct timer_list task_event; |