Merge branch 'linux-2.6'

This commit is contained in:
Paul Mackerras
2008-06-30 10:16:50 +10:00
651 changed files with 14371 additions and 8618 deletions

View File

@ -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;