diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
| commit | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (patch) | |
| tree | 35b9ab361651f649d3c9aa69f159812eba50d154 /drivers/base/core.c | |
| parent | dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db (diff) | |
| parent | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
kernel/irq/handle.c
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 55e530942ab0..f3eae630e589 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(). |