Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.25

This commit is contained in:
Josh Boyer
2008-02-06 21:06:45 -06:00
14 changed files with 2031 additions and 43 deletions

View File

@ -37,7 +37,7 @@ static int __init virtex_probe(void)
{
unsigned long root = of_get_flat_dt_root();
if (!of_flat_dt_is_compatible(root, "xilinx,virtex"))
if (!of_flat_dt_is_compatible(root, "xlnx,virtex"))
return 0;
return 1;