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/afs/proc.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/afs/proc.c')
| -rw-r--r-- | fs/afs/proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/afs/proc.c b/fs/afs/proc.c index 7578c1ab9e0b..8630615e57fe 100644 --- a/fs/afs/proc.c +++ b/fs/afs/proc.c | |||
| @@ -146,7 +146,6 @@ int afs_proc_init(void) | |||
| 146 | proc_afs = proc_mkdir("fs/afs", NULL); | 146 | proc_afs = proc_mkdir("fs/afs", NULL); |
| 147 | if (!proc_afs) | 147 | if (!proc_afs) |
| 148 | goto error_dir; | 148 | goto error_dir; |
| 149 | proc_afs->owner = THIS_MODULE; | ||
| 150 | 149 | ||
| 151 | p = proc_create("cells", 0, proc_afs, &afs_proc_cells_fops); | 150 | p = proc_create("cells", 0, proc_afs, &afs_proc_cells_fops); |
| 152 | if (!p) | 151 | if (!p) |