diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
| commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
| tree | 7064703c5d63d44700085cd701703457730bc06e /drivers/base/core.c | |
| parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 55e530942ab..f3eae630e58 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -1280,7 +1280,7 @@ EXPORT_SYMBOL_GPL(__root_device_register); | |||
| 1280 | 1280 | ||
| 1281 | /** | 1281 | /** |
| 1282 | * root_device_unregister - unregister and free a root device | 1282 | * root_device_unregister - unregister and free a root device |
| 1283 | * @root: device going away. | 1283 | * @dev: device going away |
| 1284 | * | 1284 | * |
| 1285 | * This function unregisters and cleans up a device that was created by | 1285 | * This function unregisters and cleans up a device that was created by |
| 1286 | * root_device_register(). | 1286 | * root_device_register(). |