diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/uwb/umc-dev.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.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 ccd2184e05d..b2948ec5787 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 | { |