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 /arch/powerpc | |
| 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 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/40x/virtex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c index 88b66444dfb2..0422590040db 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) | |||
| 37 | { | 37 | { |
| 38 | unsigned long root = of_get_flat_dt_root(); | 38 | unsigned long root = of_get_flat_dt_root(); |
| 39 | 39 | ||
| 40 | if (!of_flat_dt_is_compatible(root, "xilinx,virtex")) | 40 | if (!of_flat_dt_is_compatible(root, "xlnx,virtex")) |
| 41 | return 0; | 41 | return 0; |
| 42 | 42 | ||
| 43 | return 1; | 43 | return 1; |