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/sysv/sysv.h | |
| 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/sysv/sysv.h')
| -rw-r--r-- | fs/sysv/sysv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h index 38ebe3f85b3d..5784a318c883 100644 --- a/fs/sysv/sysv.h +++ b/fs/sysv/sysv.h | |||
| @@ -170,7 +170,7 @@ extern const struct file_operations sysv_file_operations; | |||
| 170 | extern const struct file_operations sysv_dir_operations; | 170 | extern const struct file_operations sysv_dir_operations; |
| 171 | extern const struct address_space_operations sysv_aops; | 171 | extern const struct address_space_operations sysv_aops; |
| 172 | extern const struct super_operations sysv_sops; | 172 | extern const struct super_operations sysv_sops; |
| 173 | extern struct dentry_operations sysv_dentry_operations; | 173 | extern const struct dentry_operations sysv_dentry_operations; |
| 174 | 174 | ||
| 175 | 175 | ||
| 176 | enum { | 176 | enum { |