diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 12:17:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 12:17:03 -0700 |
| commit | 5606b7f925b36f25a6646bb93a0cf74981de3d28 (patch) | |
| tree | 4db5e43a4af178cad6b9090df7c6c0d95bba27d2 /drivers/pci/hotplug/acpiphp.h | |
| parent | 3218911f839b6c85acbf872ad264ea69aa4d89ad (diff) | |
| parent | 9d911d7903926a65ef49ec671bacd86bcee5eb51 (diff) | |
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: acpiphp: don't store a pci_dev in acpiphp_func
Diffstat (limited to 'drivers/pci/hotplug/acpiphp.h')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index 4fc168b7009..e68d5f20ffb 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h @@ -129,7 +129,6 @@ struct acpiphp_func { struct acpiphp_bridge *bridge; /* Ejectable PCI-to-PCI bridge */ struct list_head sibling; - struct pci_dev *pci_dev; struct notifier_block nb; acpi_handle handle; |