diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-10 11:00:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-10 11:00:37 -0700 |
| commit | 9b8f013a8361b05edf511f04fe93b36310b73806 (patch) | |
| tree | 1c23961d09cc4a47514a501b6f8a6a0f9290a7c2 /drivers/pci | |
| parent | 9bcf73f48280ef8cd7f2e38e674da47c409b9906 (diff) | |
| parent | 94f81a47c4a7a2d7a16fcfdd6d81da381732c101 (diff) | |
| download | blackbird-op-linux-9b8f013a8361b05edf511f04fe93b36310b73806.tar.gz blackbird-op-linux-9b8f013a8361b05edf511f04fe93b36310b73806.zip | |
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: SGI hotplug: do not use hotplug_slot_attr
PCI hotplug: SGI hotplug: fix build failure
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/sgi_hotplug.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c index a4494d78e7c2..8aebe1e9d3d6 100644 --- a/drivers/pci/hotplug/sgi_hotplug.c +++ b/drivers/pci/hotplug/sgi_hotplug.c @@ -90,11 +90,10 @@ static struct hotplug_slot_ops sn_hotplug_slot_ops = { static DEFINE_MUTEX(sn_hotplug_mutex); -static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot, - char *buf) +static ssize_t path_show(struct pci_slot *pci_slot, char *buf) { int retval = -ENOENT; - struct slot *slot = bss_hotplug_slot->private; + struct slot *slot = pci_slot->hotplug->private; if (!slot) return retval; @@ -103,7 +102,7 @@ static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot, return retval; } -static struct hotplug_slot_attribute sn_slot_path_attr = __ATTR_RO(path); +static struct pci_slot_attribute sn_slot_path_attr = __ATTR_RO(path); static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device) { |
