diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/uwb/umc-dev.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
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 | { |