Merge branch 'master' into for-next

[linux-imx.git] / drivers / bluetooth / ath3k.c

diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 33c9a44a967899ac5b46e9b3e9951b2e80ff164d..a8a41e07a221695684fd78770980749b25ff2b5a 100644 (file)
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -349,7 +349,7 @@ static int ath3k_load_syscfg(struct usb_device *udev)
 
        ret = ath3k_get_state(udev, &fw_state);
        if (ret < 0) {
-               BT_ERR("Can't get state to change to load configration err");
+               BT_ERR("Can't get state to change to load configuration err");
                return -EBUSY;
        }