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
commit 256ae6a720
14 changed files with 2031 additions and 43 deletions

View file

@ -459,8 +459,8 @@ static int __devexit xilinxfb_of_remove(struct of_device *op)
}
/* Match table for of_platform binding */
static struct of_device_id __devinit xilinxfb_of_match[] = {
{ .compatible = "xilinx,ml300-fb", },
static struct of_device_id xilinxfb_of_match[] __devinitdata = {
{ .compatible = "xlnx,plb-tft-cntlr-ref-1.00.a", },
{},
};
MODULE_DEVICE_TABLE(of, xilinxfb_of_match);