diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 10:28:38 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-10-17 02:38:35 +1100 |
| commit | a65e5d782f9db2a61a914dc01a329e0c2dcf92a1 (patch) | |
| tree | 2143455a8bbcb49bbcef746e45f06e497f2eadfb /drivers/video/fbmem.c | |
| parent | 04ab591808565f968d4406f6435090ad671ebdab (diff) | |
| download | talos-obmc-linux-a65e5d782f9db2a61a914dc01a329e0c2dcf92a1.tar.gz talos-obmc-linux-a65e5d782f9db2a61a914dc01a329e0c2dcf92a1.zip | |
remove CONFIG_KMOD from drivers
Straight forward conversions to CONFIG_MODULE; many drivers
include <linux/kmod.h> conditionally and then don't have any
other conditional code so remove it from those.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: video4linux-list@redhat.com
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: linux-ppp@vger.kernel.org
Cc: dm-devel@redhat.com
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 0737570030f5..3f18bb9abad0 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -28,9 +28,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/console.h> -#ifdef CONFIG_KMOD #include <linux/kmod.h> -#endif #include <linux/err.h> #include <linux/device.h> #include <linux/efi.h> @@ -837,13 +835,6 @@ fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) return (cnt) ? cnt : err; } -#ifdef CONFIG_KMOD -static void try_to_load(int fb) -{ - request_module("fb%d", fb); -} -#endif /* CONFIG_KMOD */ - int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) { @@ -1086,10 +1077,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, return -EINVAL; if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX) return -EINVAL; -#ifdef CONFIG_KMOD if (!registered_fb[con2fb.framebuffer]) - try_to_load(con2fb.framebuffer); -#endif /* CONFIG_KMOD */ + request_module("fb%d", con2fb.framebuffer); if (!registered_fb[con2fb.framebuffer]) return -EINVAL; event.info = info; @@ -1327,10 +1316,8 @@ fb_open(struct inode *inode, struct file *file) if (fbidx >= FB_MAX) return -ENODEV; lock_kernel(); -#ifdef CONFIG_KMOD if (!(info = registered_fb[fbidx])) - try_to_load(fbidx); -#endif /* CONFIG_KMOD */ + request_module("fb%d", fbidx); if (!(info = registered_fb[fbidx])) { res = -ENODEV; goto out; |
