diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 21:38:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 21:38:34 +0200 |
| commit | c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 (patch) | |
| tree | edfd028285e21ba549d047c0caa4ffe523272f94 /drivers/net/ppp_generic.c | |
| parent | Merge branch 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | module: remove CONFIG_KMOD in comment after #endif (diff) | |
| download | linux-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.tar.xz linux-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
module: remove CONFIG_KMOD in comment after #endif
remove CONFIG_KMOD from fs
remove CONFIG_KMOD from drivers
Manually fix conflict due to include cleanups in drivers/md/md.c
Diffstat (limited to 'drivers/net/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp_generic.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 0ca0fcbb7c01..94818ee3cef5 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -2127,13 +2127,9 @@ ppp_set_compress(struct ppp *ppp, unsigned long arg) || ccp_option[1] < 2 || ccp_option[1] > data.length) goto out; - cp = find_compressor(ccp_option[0]); -#ifdef CONFIG_KMOD - if (!cp) { - request_module("ppp-compress-%d", ccp_option[0]); - cp = find_compressor(ccp_option[0]); - } -#endif /* CONFIG_KMOD */ + cp = try_then_request_module( + find_compressor(ccp_option[0]), + "ppp-compress-%d", ccp_option[0]); if (!cp) goto out; |