diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /lib/idr.c | |
| parent | c52854018ad123c9ef83867462457b75bb56d452 (diff) | |
| parent | 285eae0a4ba0f467341476fd4c6981e5cdafc6be (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
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 |