diff options
author | Paul Mackerras <paulus@samba.org> | 2008-06-30 02:16:50 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-06-30 02:16:50 +0200 |
commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /arch/powerpc/kernel/irq.c | |
parent | Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/po... (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
download | linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.tar.xz linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.zip |
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 = { static int __init irq_debugfs_init(void) { if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, - NULL, &virq_debug_fops)) + NULL, &virq_debug_fops) == NULL) return -ENOMEM; return 0; |