diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
| commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
| tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /drivers/net/irda/sir_dongle.c | |
| parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'drivers/net/irda/sir_dongle.c')
| -rw-r--r-- | drivers/net/irda/sir_dongle.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/irda/sir_dongle.c b/drivers/net/irda/sir_dongle.c index 36030241f7a..2a9930e6e2a 100644 --- 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) | |||
| 67 | const struct dongle_driver *drv = NULL; | 67 | const struct dongle_driver *drv = NULL; |
| 68 | int err = -EINVAL; | 68 | int err = -EINVAL; |
| 69 | 69 | ||
| 70 | #ifdef CONFIG_KMOD | ||
| 71 | request_module("irda-dongle-%d", type); | 70 | request_module("irda-dongle-%d", type); |
| 72 | #endif | ||
| 73 | 71 | ||
| 74 | if (dev->dongle_drv != NULL) | 72 | if (dev->dongle_drv != NULL) |
| 75 | return -EBUSY; | 73 | return -EBUSY; |