aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-12 21:59:11 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-12 21:59:11 -0500
commitbd1f7936ab5138d7e5e4f61bb4371e2994b2b2c5 (patch)
tree09e5424736112005c309fcd5cb572111f265197e /drivers/block
parent30aae739a9eb6db31ad7b08dac44bd302f41c709 (diff)
parentff82c587a9a4cb8796e7e04377155deba15ae18b (diff)
Merge commit 'gcl/gcl-next' into next
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/xsysace.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 29e1dfafb7c6..381d686fc1a3 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1206,6 +1206,7 @@ static struct of_device_id ace_of_match[] __devinitdata = {
1206 { .compatible = "xlnx,opb-sysace-1.00.b", }, 1206 { .compatible = "xlnx,opb-sysace-1.00.b", },
1207 { .compatible = "xlnx,opb-sysace-1.00.c", }, 1207 { .compatible = "xlnx,opb-sysace-1.00.c", },
1208 { .compatible = "xlnx,xps-sysace-1.00.a", }, 1208 { .compatible = "xlnx,xps-sysace-1.00.a", },
1209 { .compatible = "xlnx,sysace", },
1209 {}, 1210 {},
1210}; 1211};
1211MODULE_DEVICE_TABLE(of, ace_of_match); 1212MODULE_DEVICE_TABLE(of, ace_of_match);