Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6

This commit is contained in:
Nicolas Ferre 2012-03-01 13:24:22 +01:00
commit 89d4a1753b
424 changed files with 3720 additions and 44304 deletions

View file

@ -55,7 +55,7 @@ EXPORT_SYMBOL(of_find_device_by_node);
#include <asm/dcr.h>
#endif
#if !defined(CONFIG_SPARC)
#ifdef CONFIG_OF_ADDRESS
/*
* The following routines scan a subtree and registers a device for
* each applicable node.
@ -462,4 +462,4 @@ int of_platform_populate(struct device_node *root,
of_node_put(root);
return rc;
}
#endif /* !CONFIG_SPARC */
#endif /* CONFIG_OF_ADDRESS */