diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-07 23:24:07 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-07 23:24:07 -0700 |
| commit | a292241cccb7e20e8b997a9a44177e7c98141859 (patch) | |
| tree | a0b0bb95e7dce3233a2d8b203f9e326cdec7a00e /lib/kobject.c | |
| parent | Input: synaptics - fix resolution for manually provided min/max (diff) | |
| parent | Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version (diff) | |
| download | wireguard-linux-a292241cccb7e20e8b997a9a44177e7c98141859.tar.xz wireguard-linux-a292241cccb7e20e8b997a9a44177e7c98141859.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 3.16.
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index cb14aeac4cca..58751bb80a7c 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -94,7 +94,7 @@ static int create_dir(struct kobject *kobj) BUG_ON(ops->type >= KOBJ_NS_TYPES); BUG_ON(!kobj_ns_type_registered(ops->type)); - kernfs_enable_ns(kobj->sd); + sysfs_enable_ns(kobj->sd); } return 0; |