diff options
author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:07:23 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:07:23 -0400 |
commit | df760137ad3cbfa15ceed42478f81bff01b6e799 (patch) | |
tree | be939c9d11094858d74141a4c62cb23f477754d8 /fs/ceph/auth.c | |
parent | 754b8e653412106ff613f4750b197f807fcd8347 (diff) | |
parent | de997718b64df2f766736f23f8557da450b83a25 (diff) |
Merge branch 'omap-boards' into omap-for-linus
Diffstat (limited to 'fs/ceph/auth.c')
-rw-r--r-- | fs/ceph/auth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/auth.c b/fs/ceph/auth.c index f6394b94b866..818afe72e6c7 100644 --- a/fs/ceph/auth.c +++ b/fs/ceph/auth.c | |||
@@ -3,6 +3,7 @@ | |||
3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
4 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
5 | #include <linux/err.h> | 5 | #include <linux/err.h> |
6 | #include <linux/slab.h> | ||
6 | 7 | ||
7 | #include "types.h" | 8 | #include "types.h" |
8 | #include "auth_none.h" | 9 | #include "auth_none.h" |