diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/pci/pci-driver.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index a9046d4b8af3..7146b69b812c 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
| @@ -502,8 +502,8 @@ void pci_dev_put(struct pci_dev *dev) | |||
| 502 | } | 502 | } |
| 503 | 503 | ||
| 504 | #ifndef CONFIG_HOTPLUG | 504 | #ifndef CONFIG_HOTPLUG |
| 505 | int pci_hotplug (struct device *dev, char **envp, int num_envp, | 505 | int pci_uevent(struct device *dev, char **envp, int num_envp, |
| 506 | char *buffer, int buffer_size) | 506 | char *buffer, int buffer_size) |
| 507 | { | 507 | { |
| 508 | return -ENODEV; | 508 | return -ENODEV; |
| 509 | } | 509 | } |
| @@ -512,7 +512,7 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp, | |||
| 512 | struct bus_type pci_bus_type = { | 512 | struct bus_type pci_bus_type = { |
| 513 | .name = "pci", | 513 | .name = "pci", |
| 514 | .match = pci_bus_match, | 514 | .match = pci_bus_match, |
| 515 | .hotplug = pci_hotplug, | 515 | .uevent = pci_uevent, |
| 516 | .suspend = pci_device_suspend, | 516 | .suspend = pci_device_suspend, |
| 517 | .resume = pci_device_resume, | 517 | .resume = pci_device_resume, |
| 518 | .dev_attrs = pci_dev_attrs, | 518 | .dev_attrs = pci_dev_attrs, |