From 974159d8684a9ef93c98cb120ffd03dec704c9db Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 24 Jun 2009 09:18:14 -0700
Subject: [PATCH] --- yaml --- r: 154971 b: refs/heads/master c:
 503998ca4a295f7da233689850ba4b9d13cf41e7 h: refs/heads/master i:   154969:
 8f4448c043686f8edb8edeb3633136dbfff802d8   154967:
 44cd414fc653e51d168f45ffaa446e0f263279ac v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/pci/hotplug/pci_hotplug_core.c | 2 ++
 trunk/drivers/pci/slot.c                     | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 59f1dc3582e3..a17123e90386 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 654b75e044119bf8e7d773bce41ea039281bbfbe
+refs/heads/master: 503998ca4a295f7da233689850ba4b9d13cf41e7
diff --git a/trunk/drivers/pci/hotplug/pci_hotplug_core.c b/trunk/drivers/pci/hotplug/pci_hotplug_core.c
index 844580489d4d..5c5043f239cf 100644
--- a/trunk/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/trunk/drivers/pci/hotplug/pci_hotplug_core.c
@@ -555,6 +555,8 @@ static struct hotplug_slot *get_slot_from_name (const char *name)
  * @slot: pointer to the &struct hotplug_slot to register
  * @devnr: device number
  * @name: name registered with kobject core
+ * @owner: caller module owner
+ * @mod_name: caller module name
  *
  * Registers a hotplug slot with the pci hotplug subsystem, which will allow
  * userspace interaction to the slot.
diff --git a/trunk/drivers/pci/slot.c b/trunk/drivers/pci/slot.c
index eddb0748b0ea..8c02b6c53bdb 100644
--- a/trunk/drivers/pci/slot.c
+++ b/trunk/drivers/pci/slot.c
@@ -311,7 +311,7 @@ EXPORT_SYMBOL_GPL(pci_destroy_slot);
 #include <linux/pci_hotplug.h>
 /**
  * pci_hp_create_link - create symbolic link to the hotplug driver module.
- * @slot: struct pci_slot
+ * @pci_slot: struct pci_slot
  *
  * Helper function for pci_hotplug_core.c to create symbolic link to
  * the hotplug driver module.
@@ -334,7 +334,7 @@ EXPORT_SYMBOL_GPL(pci_hp_create_module_link);
 
 /**
  * pci_hp_remove_link - remove symbolic link to the hotplug driver module.
- * @slot: struct pci_slot
+ * @pci_slot: struct pci_slot
  *
  * Helper function for pci_hotplug_core.c to remove symbolic link to
  * the hotplug driver module.