aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-02-06 21:06:45 -0600
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-02-06 21:06:45 -0600
commit256ae6a720618cbbfacc5e62ea1fe7c129d1b644 (patch)
tree99fbc75fe12eeb737b42e0a8a8cef57df89596a6 /drivers/block
parente8318d98e95ddd3969c0701b5d15ec961ce786b2 (diff)
parentef66a9d222718f080018d07f691faa1f01789e7d (diff)
downloadkernel_samsung_smdk4412-256ae6a720618cbbfacc5e62ea1fe7c129d1b644.zip
kernel_samsung_smdk4412-256ae6a720618cbbfacc5e62ea1fe7c129d1b644.tar.gz
kernel_samsung_smdk4412-256ae6a720618cbbfacc5e62ea1fe7c129d1b644.tar.bz2
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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 78ebfff..4a7a059 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)
}
/* Match table for of_platform binding */
-static struct of_device_id __devinit ace_of_match[] = {
- { .compatible = "xilinx,xsysace", },
+static struct of_device_id ace_of_match[] __devinitdata = {
+ { .compatible = "xlnx,opb-sysace-1.00.b", },
+ { .compatible = "xlnx,opb-sysace-1.00.c", },
+ { .compatible = "xlnx,xps-sysace-1.00.a", },
{},
};
MODULE_DEVICE_TABLE(of, ace_of_match);