diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
tree | 547fd497a80818a60ac36831377d5df97868173c /arch/powerpc/kernel/irq.c | |
parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into x86/pebs
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 2f73f705d564..bcc249d90c4d 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; |