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/ecryptfs/ecryptfs_kernel.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/ecryptfs/ecryptfs_kernel.h')
| -rw-r--r-- | fs/ecryptfs/ecryptfs_kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index ac749d4d644f..064c5820e4e5 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h | |||
| @@ -580,7 +580,7 @@ extern const struct inode_operations ecryptfs_main_iops; | |||
| 580 | extern const struct inode_operations ecryptfs_dir_iops; | 580 | extern const struct inode_operations ecryptfs_dir_iops; |
| 581 | extern const struct inode_operations ecryptfs_symlink_iops; | 581 | extern const struct inode_operations ecryptfs_symlink_iops; |
| 582 | extern const struct super_operations ecryptfs_sops; | 582 | extern const struct super_operations ecryptfs_sops; |
| 583 | extern struct dentry_operations ecryptfs_dops; | 583 | extern const struct dentry_operations ecryptfs_dops; |
| 584 | extern struct address_space_operations ecryptfs_aops; | 584 | extern struct address_space_operations ecryptfs_aops; |
| 585 | extern int ecryptfs_verbosity; | 585 | extern int ecryptfs_verbosity; |
| 586 | extern unsigned int ecryptfs_message_buf_len; | 586 | extern unsigned int ecryptfs_message_buf_len; |