git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
pci
/
hotplug
/
acpiphp.h
diff --git
a/drivers/pci/hotplug/acpiphp.h
b/drivers/pci/hotplug/acpiphp.h
index 4fc168b70095bcd0b76646411429a8dcf4920a1c..e68d5f20ffb3fb8198560dfb414fe126ecbeda6d 100644
(file)
--- 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;