diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /lib/idr.c | |
| parent | 6016a363f6b56b46b24655bcfc0499b715851cf3 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'lib/idr.c')
| -rw-r--r-- | lib/idr.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -281,7 +281,7 @@ static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id) | |||
| 281 | /** | 281 | /** |
| 282 | * idr_get_new_above - allocate new idr entry above or equal to a start id | 282 | * idr_get_new_above - allocate new idr entry above or equal to a start id |
| 283 | * @idp: idr handle | 283 | * @idp: idr handle |
| 284 | * @ptr: pointer you want associated with the ide | 284 | * @ptr: pointer you want associated with the id |
| 285 | * @start_id: id to start search at | 285 | * @start_id: id to start search at |
| 286 | * @id: pointer to the allocated handle | 286 | * @id: pointer to the allocated handle |
| 287 | * | 287 | * |
| @@ -313,7 +313,7 @@ EXPORT_SYMBOL(idr_get_new_above); | |||
| 313 | /** | 313 | /** |
| 314 | * idr_get_new - allocate new idr entry | 314 | * idr_get_new - allocate new idr entry |
| 315 | * @idp: idr handle | 315 | * @idp: idr handle |
| 316 | * @ptr: pointer you want associated with the ide | 316 | * @ptr: pointer you want associated with the id |
| 317 | * @id: pointer to the allocated handle | 317 | * @id: pointer to the allocated handle |
| 318 | * | 318 | * |
| 319 | * This is the allocate id function. It should be called with any | 319 | * This is the allocate id function. It should be called with any |