Merge branch 'linus' into tracing/ftrace

2008-06-23 11:11:42 +02:00
parent ee4311adf1 481c5346d0
commit f34bfb1bee
284 changed files with 9946 additions and 5481 deletions
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -1073,7 +1073,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;