diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 00:21:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 00:21:02 -0700 |
commit | 6d87f207c04370681b9a710b8dbed0f567491e49 (patch) | |
tree | b6ca4ab9f7358f2ec8088fbadcb5f078a9c022f2 /include/linux/sysfs.h | |
parent | d20de763548f9948f4534fc816155d8ee48e1d35 (diff) | |
parent | f6e6e7799ebcad40fa15e4015beca2d776554302 (diff) | |
download | blackbird-op-linux-6d87f207c04370681b9a710b8dbed0f567491e49.tar.gz blackbird-op-linux-6d87f207c04370681b9a710b8dbed0f567491e49.zip |
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:
kobject_uevent: fix typo in comments
firmware_class: fix typo in error path
kobject: Break the kobject namespace defs into their own header
Diffstat (limited to 'include/linux/sysfs.h')
-rw-r--r-- | include/linux/sysfs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 3c92121ba9af..96eb576d82fd 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -16,6 +16,7 @@ #include <linux/errno.h> #include <linux/list.h> #include <linux/lockdep.h> +#include <linux/kobject_ns.h> #include <asm/atomic.h> struct kobject; |