summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-29 18:14:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-29 18:14:05 -0800
commit5488ace40be22d3f23f58190ae48b2c8d4691f2b (patch)
tree657ebb2cba451fa9925ddaa3947d96378bdbe40a /drivers
parent05986e264ee638b6b6151aea89c9f191278c30f1 (diff)
parent7cbcf22548df1f1df7c6b0d0bda579b92efca63c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: driver-core: fix kernel-doc parameter name UIO: Add missing documentation of features added recently Sync patch for jp_JP/stable_kernel_rules.txt
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/core.c2
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);
/**
* root_device_unregister - unregister and free a root device
- * @root: device going away.
+ * @dev: device going away
*
* This function unregisters and cleans up a device that was created by
* root_device_register().