diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /drivers/base | |
parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/base')
-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(). |