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

3 files changed, 5 insertions, 16 deletions

diff --git a/drivers/net/irda/sir_dongle.c b/drivers/net/irda/sir_dongle.c
index 36030241f7a9..2a9930e6e2af 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)
         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;
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;
 
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
index c6898c1fc54d..03aecc97fb45 100644
--- a/drivers/net/pppox.c
+++ b/drivers/net/pppox.c
@@ -115,13 +115,8 @@ static int pppox_create(struct net *net, struct socket *sock, int protocol)
                 goto out;
 
         rc = -EPROTONOSUPPORT;
-#ifdef CONFIG_KMOD
-        if (!pppox_protos[protocol]) {
-                char buffer[32];
-                sprintf(buffer, "pppox-proto-%d", protocol);
-                request_module(buffer);
-        }
-#endif
+        if (!pppox_protos[protocol])
+                request_module("pppox-proto-%d", protocol);
         if (!pppox_protos[protocol] ||
             !try_module_get(pppox_protos[protocol]->owner))
                 goto out;