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/hfs/sysdep.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/hfs/sysdep.c')
| -rw-r--r-- | fs/hfs/sysdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfs/sysdep.c b/fs/hfs/sysdep.c index 5bf89ec01cd4..7478f5c219aa 100644 --- a/fs/hfs/sysdep.c +++ b/fs/hfs/sysdep.c | |||
| @@ -31,7 +31,7 @@ static int hfs_revalidate_dentry(struct dentry *dentry, struct nameidata *nd) | |||
| 31 | return 1; | 31 | return 1; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | struct dentry_operations hfs_dentry_operations = | 34 | const struct dentry_operations hfs_dentry_operations = |
| 35 | { | 35 | { |
| 36 | .d_revalidate = hfs_revalidate_dentry, | 36 | .d_revalidate = hfs_revalidate_dentry, |
| 37 | .d_hash = hfs_hash_dentry, | 37 | .d_hash = hfs_hash_dentry, |