diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
commit | f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch) | |
tree | 0816c565d26ae24854616faa0d497be365c2fe8b /arch/powerpc/kernel/irq.c | |
parent | ee4311adf105f4d740f52e3948acc1d81598afcc (diff) | |
parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r-- | arch/powerpc/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 6e01eb0a3315..dcc946e67099 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -1073,7 +1073,7 @@ static const struct file_operations virq_debug_fops = { | |||
1073 | static int __init irq_debugfs_init(void) | 1073 | static int __init irq_debugfs_init(void) |
1074 | { | 1074 | { |
1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, | 1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, |
1076 | NULL, &virq_debug_fops)) | 1076 | NULL, &virq_debug_fops) == NULL) |
1077 | return -ENOMEM; | 1077 | return -ENOMEM; |
1078 | 1078 | ||
1079 | return 0; | 1079 | return 0; |