diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/jfs/jfs_unicode.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/jfs/jfs_unicode.h')
| -rw-r--r-- | fs/jfs/jfs_unicode.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jfs/jfs_unicode.h b/fs/jfs/jfs_unicode.h index 3fbb3a225590..8f0f02cb6ca6 100644 --- a/fs/jfs/jfs_unicode.h +++ b/fs/jfs/jfs_unicode.h | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #ifndef _H_JFS_UNICODE | 19 | #ifndef _H_JFS_UNICODE |
| 20 | #define _H_JFS_UNICODE | 20 | #define _H_JFS_UNICODE |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 22 | #include <asm/byteorder.h> | 23 | #include <asm/byteorder.h> |
| 23 | #include "jfs_types.h" | 24 | #include "jfs_types.h" |
| 24 | 25 | ||