diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
commit | 84860bf0644d7c45afe7ddbd30731c3e3c371fae (patch) | |
tree | d6c4b98a9c3fd9981e7fcc5d7729c9e01e327767 /drivers/base/driver.c | |
parent | 8caf89157d64f1eedba37113afb4b303b2b3e301 (diff) | |
parent | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/base/driver.c')
-rw-r--r-- | drivers/base/driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index ef3fe513e398..161f3a390d90 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c | |||
@@ -28,6 +28,7 @@ static struct device * next_device(struct klist_iter * i) | |||
28 | /** | 28 | /** |
29 | * driver_for_each_device - Iterator for devices bound to a driver. | 29 | * driver_for_each_device - Iterator for devices bound to a driver. |
30 | * @drv: Driver we're iterating. | 30 | * @drv: Driver we're iterating. |
31 | * @start: Device to begin with | ||
31 | * @data: Data to pass to the callback. | 32 | * @data: Data to pass to the callback. |
32 | * @fn: Function to call for each device. | 33 | * @fn: Function to call for each device. |
33 | * | 34 | * |
@@ -57,7 +58,7 @@ EXPORT_SYMBOL_GPL(driver_for_each_device); | |||
57 | 58 | ||
58 | /** | 59 | /** |
59 | * driver_find_device - device iterator for locating a particular device. | 60 | * driver_find_device - device iterator for locating a particular device. |
60 | * @driver: The device's driver | 61 | * @drv: The device's driver |
61 | * @start: Device to begin with | 62 | * @start: Device to begin with |
62 | * @data: Data to pass to match function | 63 | * @data: Data to pass to match function |
63 | * @match: Callback function to check device | 64 | * @match: Callback function to check device |