diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/usb/gadget/nokia.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/usb/gadget/nokia.c')
| -rw-r--r-- | drivers/usb/gadget/nokia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c index b5364f9d7cd2..55ca63ad3506 100644 --- a/drivers/usb/gadget/nokia.c +++ b/drivers/usb/gadget/nokia.c | |||
| @@ -203,7 +203,7 @@ static int __init nokia_bind(struct usb_composite_dev *cdev) | |||
| 203 | goto err_usb; | 203 | goto err_usb; |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | /* finaly register the configuration */ | 206 | /* finally register the configuration */ |
| 207 | status = usb_add_config(cdev, &nokia_config_500ma_driver, | 207 | status = usb_add_config(cdev, &nokia_config_500ma_driver, |
| 208 | nokia_bind_config); | 208 | nokia_bind_config); |
| 209 | if (status < 0) | 209 | if (status < 0) |