diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-02-06 22:06:45 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-02-06 22:06:45 -0500 |
| commit | 256ae6a720618cbbfacc5e62ea1fe7c129d1b644 (patch) | |
| tree | 99fbc75fe12eeb737b42e0a8a8cef57df89596a6 /drivers/video | |
| parent | e8318d98e95ddd3969c0701b5d15ec961ce786b2 (diff) | |
| parent | ef66a9d222718f080018d07f691faa1f01789e7d (diff) | |
Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.25
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/xilinxfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index e38d3b7c3ad7..7b3a8423f485 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c | |||
| @@ -459,8 +459,8 @@ static int __devexit xilinxfb_of_remove(struct of_device *op) | |||
| 459 | } | 459 | } |
| 460 | 460 | ||
| 461 | /* Match table for of_platform binding */ | 461 | /* Match table for of_platform binding */ |
| 462 | static struct of_device_id __devinit xilinxfb_of_match[] = { | 462 | static struct of_device_id xilinxfb_of_match[] __devinitdata = { |
| 463 | { .compatible = "xilinx,ml300-fb", }, | 463 | { .compatible = "xlnx,plb-tft-cntlr-ref-1.00.a", }, |
| 464 | {}, | 464 | {}, |
| 465 | }; | 465 | }; |
| 466 | MODULE_DEVICE_TABLE(of, xilinxfb_of_match); | 466 | MODULE_DEVICE_TABLE(of, xilinxfb_of_match); |