diff --git a/[refs] b/[refs] index 9333ad1295b1..00cc19a17ba6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a1b699678c8c0d45f88a37b32358a9e82bef6bb +refs/heads/master: 7cbcf22548df1f1df7c6b0d0bda579b92efca63c diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c index 55e530942ab0..f3eae630e589 100644 --- a/trunk/drivers/base/core.c +++ b/trunk/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().