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/block | |
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/block')
-rw-r--r-- | drivers/block/xsysace.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index 78ebfffc77e3..4a7a059ebaf7 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c | |||
@@ -1202,8 +1202,10 @@ static int __devexit ace_of_remove(struct of_device *op) | |||
1202 | } | 1202 | } |
1203 | 1203 | ||
1204 | /* Match table for of_platform binding */ | 1204 | /* Match table for of_platform binding */ |
1205 | static struct of_device_id __devinit ace_of_match[] = { | 1205 | static struct of_device_id ace_of_match[] __devinitdata = { |
1206 | { .compatible = "xilinx,xsysace", }, | 1206 | { .compatible = "xlnx,opb-sysace-1.00.b", }, |
1207 | { .compatible = "xlnx,opb-sysace-1.00.c", }, | ||
1208 | { .compatible = "xlnx,xps-sysace-1.00.a", }, | ||
1207 | {}, | 1209 | {}, |
1208 | }; | 1210 | }; |
1209 | MODULE_DEVICE_TABLE(of, ace_of_match); | 1211 | MODULE_DEVICE_TABLE(of, ace_of_match); |