diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-10 00:29:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-10 00:29:47 -0400 |
| commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
| tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /drivers/mtd/nand/atmel_nand.c | |
| parent | 819ae6a389d4acfab9a7bb874fa1977aa464d14b (diff) | |
| parent | f4b9a988685da6386d7f9a72df3098bcc3270526 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/mtd/nand/atmel_nand.c')
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 2802992b39d..20c828ba940 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c | |||
| @@ -534,7 +534,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) | |||
| 534 | &num_partitions); | 534 | &num_partitions); |
| 535 | 535 | ||
| 536 | if ((!partitions) || (num_partitions == 0)) { | 536 | if ((!partitions) || (num_partitions == 0)) { |
| 537 | printk(KERN_ERR "atmel_nand: No parititions defined, or unsupported device.\n"); | 537 | printk(KERN_ERR "atmel_nand: No partitions defined, or unsupported device.\n"); |
| 538 | res = ENXIO; | 538 | res = ENXIO; |
| 539 | goto err_no_partitions; | 539 | goto err_no_partitions; |
| 540 | } | 540 | } |