git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
sir_dongle.c
diff --git
a/drivers/net/irda/sir_dongle.c
b/drivers/net/irda/sir_dongle.c
index
3603024
..
2a9930e
100644
(file)
--- a/
drivers/net/irda/sir_dongle.c
+++ b/
drivers/net/irda/sir_dongle.c
@@
-67,9
+67,7
@@
int sirdev_get_dongle(struct sir_dev *dev, IRDA_DONGLE type)
const struct dongle_driver *drv = NULL;
int err = -EINVAL;
-#ifdef CONFIG_KMOD
request_module("irda-dongle-%d", type);
-#endif
if (dev->dongle_drv != NULL)
return -EBUSY;