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

1 files changed, 2 insertions, 7 deletions

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;