Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b8f013a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9bcf73f4 94f81a47

drivers/pci/hotplug/sgi_hotplug.c

+3 −4
Original line number Diff line number Diff line
@@ -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)

{