aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memstick/host/r592.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-04-19 21:32:41 +1000
committerJames Morris <jmorris@namei.org>2011-04-19 21:32:41 +1000
commitd4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch)
treeeefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/memstick/host/r592.c
parentc0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff)
parent96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff)
downloadkernel_samsung_smdk4412-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.tar.gz
kernel_samsung_smdk4412-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.tar.bz2
kernel_samsung_smdk4412-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.zip
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/memstick/host/r592.c')
-rw-r--r--drivers/memstick/host/r592.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 700d420a59a..668f5c6a039 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)
if (memstick_add_host(host))
goto error7;
- message("driver succesfully loaded");
+ message("driver successfully loaded");
return 0;
error7:
free_irq(dev->irq, dev);