projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/urgent
[linux-2.6-block.git]
/
include
/
linux
/
configfs.h
diff --git
a/include/linux/configfs.h
b/include/linux/configfs.h
index 645778ad899b275977c84702a1adf991e0459e1a..3081c58d696e8314113a9c60c82afdf25c073318 100644
(file)
--- a/
include/linux/configfs.h
+++ b/
include/linux/configfs.h
@@
-42,7
+42,7
@@
#include <linux/mutex.h>
#include <linux/err.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#define CONFIGFS_ITEM_NAME_LEN 20