aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc
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 /arch/powerpc
parente8318d98e95ddd3969c0701b5d15ec961ce786b2 (diff)
parentef66a9d222718f080018d07f691faa1f01789e7d (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 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/40x/virtex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c
index 88b66444dfb..0422590040d 100644
--- a/arch/powerpc/platforms/40x/virtex.c
+++ b/arch/powerpc/platforms/40x/virtex.c
@@ -37,7 +37,7 @@ static int __init virtex_probe(void)
{
unsigned long root = of_get_flat_dt_root();
- if (!of_flat_dt_is_compatible(root, "xilinx,virtex"))
+ if (!of_flat_dt_is_compatible(root, "xlnx,virtex"))
return 0;
return 1;