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/jfs/jfs_debug.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/jfs/jfs_debug.c')
| -rw-r--r-- | fs/jfs/jfs_debug.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jfs/jfs_debug.c b/fs/jfs/jfs_debug.c index 6a73de84bcef..dd824d9b0b1a 100644 --- a/fs/jfs/jfs_debug.c +++ b/fs/jfs/jfs_debug.c | |||
| @@ -90,7 +90,6 @@ void jfs_proc_init(void) | |||
| 90 | 90 | ||
| 91 | if (!(base = proc_mkdir("fs/jfs", NULL))) | 91 | if (!(base = proc_mkdir("fs/jfs", NULL))) |
| 92 | return; | 92 | return; |
| 93 | base->owner = THIS_MODULE; | ||
| 94 | 93 | ||
| 95 | for (i = 0; i < NPROCENT; i++) | 94 | for (i = 0; i < NPROCENT; i++) |
| 96 | proc_create(Entries[i].name, 0, base, Entries[i].proc_fops); | 95 | proc_create(Entries[i].name, 0, base, Entries[i].proc_fops); |