diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-01-05 17:52:11 +0100 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-01-05 17:52:11 +0100 |
| commit | 5c3eee79128c372a81a83665be2332a000944280 (patch) | |
| tree | e44331d36d63adc971003cc32540d0cb0c019525 /drivers/pci/pci-driver.c | |
| parent | [IA64] incorrect return from ia64_pci_legacy_write() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
| download | linux-5c3eee79128c372a81a83665be2332a000944280.tar.xz linux-5c3eee79128c372a81a83665be2332a000944280.zip | |
Auto-update from upstream
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) } #ifndef CONFIG_HOTPLUG -int pci_hotplug (struct device *dev, char **envp, int num_envp, - char *buffer, int buffer_size) +int pci_uevent(struct device *dev, char **envp, int num_envp, + char *buffer, int buffer_size) { return -ENODEV; } @@ -512,7 +512,7 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp, struct bus_type pci_bus_type = { .name = "pci", .match = pci_bus_match, - .hotplug = pci_hotplug, + .uevent = pci_uevent, .suspend = pci_device_suspend, .resume = pci_device_resume, .dev_attrs = pci_dev_attrs, |