diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/ntfs/dir.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/ntfs/dir.c')
| -rw-r--r-- | fs/ntfs/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c index 34314b33dbd4..5a9e34475e37 100644 --- a/fs/ntfs/dir.c +++ b/fs/ntfs/dir.c | |||
| @@ -32,8 +32,8 @@ | |||
| 32 | /** | 32 | /** |
| 33 | * The little endian Unicode string $I30 as a global constant. | 33 | * The little endian Unicode string $I30 as a global constant. |
| 34 | */ | 34 | */ |
| 35 | ntfschar I30[5] = { const_cpu_to_le16('$'), const_cpu_to_le16('I'), | 35 | ntfschar I30[5] = { cpu_to_le16('$'), cpu_to_le16('I'), |
| 36 | const_cpu_to_le16('3'), const_cpu_to_le16('0'), 0 }; | 36 | cpu_to_le16('3'), cpu_to_le16('0'), 0 }; |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * ntfs_lookup_inode_by_name - find an inode in a directory given its name | 39 | * ntfs_lookup_inode_by_name - find an inode in a directory given its name |