Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[net-next-2.6.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 2cb49a93b1e6461f8174744609dee4fb1c254ca9..6ed645411c40d4bd7c59d33a9055da24e7ff1159 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -233,7 +233,7 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj,
                                 __func__, retval);
        }
 
-       /* have the device type specific fuction add its stuff */
+       /* have the device type specific function add its stuff */
        if (dev->type && dev->type->uevent) {
                retval = dev->type->uevent(dev, env);
                if (retval)