diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/memstick/host/r592.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/memstick/host/r592.c')
| -rw-r--r-- | drivers/memstick/host/r592.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c index 700d420a59ac..668f5c6a0399 100644 --- a/drivers/memstick/host/r592.c +++ b/drivers/memstick/host/r592.c | |||
| @@ -796,7 +796,7 @@ static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 796 | if (memstick_add_host(host)) | 796 | if (memstick_add_host(host)) |
| 797 | goto error7; | 797 | goto error7; |
| 798 | 798 | ||
| 799 | message("driver succesfully loaded"); | 799 | message("driver successfully loaded"); |
| 800 | return 0; | 800 | return 0; |
| 801 | error7: | 801 | error7: |
| 802 | free_irq(dev->irq, dev); | 802 | free_irq(dev->irq, dev); |