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/uwb/umc-dev.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/uwb/umc-dev.c')
| -rw-r--r-- | drivers/uwb/umc-dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c index ccd2184e05d2..b2948ec57878 100644 --- a/drivers/uwb/umc-dev.c +++ b/drivers/uwb/umc-dev.c | |||
| @@ -78,7 +78,7 @@ EXPORT_SYMBOL_GPL(umc_device_register); | |||
| 78 | * First we unregister the device, make sure the driver can do it's | 78 | * First we unregister the device, make sure the driver can do it's |
| 79 | * resource release thing and then we try to release any left over | 79 | * resource release thing and then we try to release any left over |
| 80 | * resources. We take a ref to the device, to make sure it doesn't | 80 | * resources. We take a ref to the device, to make sure it doesn't |
| 81 | * dissapear under our feet. | 81 | * disappear under our feet. |
| 82 | */ | 82 | */ |
| 83 | void umc_device_unregister(struct umc_dev *umc) | 83 | void umc_device_unregister(struct umc_dev *umc) |
| 84 | { | 84 | { |