diff options
author | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /arch/powerpc/kernel/irq.c | |
parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) |
Merge branch 'linux-2.6'
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 e9238556ae50..d6df018bb584 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -1106,7 +1106,7 @@ static const struct file_operations virq_debug_fops = { | |||
1106 | static int __init irq_debugfs_init(void) | 1106 | static int __init irq_debugfs_init(void) |
1107 | { | 1107 | { |
1108 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, | 1108 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, |
1109 | NULL, &virq_debug_fops)) | 1109 | NULL, &virq_debug_fops) == NULL) |
1110 | return -ENOMEM; | 1110 | return -ENOMEM; |
1111 | 1111 | ||
1112 | return 0; | 1112 | return 0; |