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
This commit is contained in:
commit
9b8f013a83
|
@ -90,11 +90,10 @@ static struct hotplug_slot_ops sn_hotplug_slot_ops = {
|
||||||
|
|
||||||
static DEFINE_MUTEX(sn_hotplug_mutex);
|
static DEFINE_MUTEX(sn_hotplug_mutex);
|
||||||
|
|
||||||
static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot,
|
static ssize_t path_show(struct pci_slot *pci_slot, char *buf)
|
||||||
char *buf)
|
|
||||||
{
|
{
|
||||||
int retval = -ENOENT;
|
int retval = -ENOENT;
|
||||||
struct slot *slot = bss_hotplug_slot->private;
|
struct slot *slot = pci_slot->hotplug->private;
|
||||||
|
|
||||||
if (!slot)
|
if (!slot)
|
||||||
return retval;
|
return retval;
|
||||||
|
@ -103,7 +102,7 @@ static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot,
|
||||||
return retval;
|
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)
|
static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue