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/coda/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/coda/dir.c')
| -rw-r--r-- | fs/coda/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/coda/dir.c b/fs/coda/dir.c index 75b1fa90b2cb..4bb9d0a5decc 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c | |||
| @@ -59,7 +59,7 @@ static int coda_return_EIO(void) | |||
| 59 | } | 59 | } |
| 60 | #define CODA_EIO_ERROR ((void *) (coda_return_EIO)) | 60 | #define CODA_EIO_ERROR ((void *) (coda_return_EIO)) |
| 61 | 61 | ||
| 62 | static struct dentry_operations coda_dentry_operations = | 62 | static const struct dentry_operations coda_dentry_operations = |
| 63 | { | 63 | { |
| 64 | .d_revalidate = coda_dentry_revalidate, | 64 | .d_revalidate = coda_dentry_revalidate, |
| 65 | .d_delete = coda_dentry_delete, | 65 | .d_delete = coda_dentry_delete, |