diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:38:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:38:34 -0700 |
| commit | c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 (patch) | |
| tree | edfd028285e21ba549d047c0caa4ffe523272f94 /drivers/video | |
| parent | e4856a70cfc23266631a78e78277cf2b195babee (diff) | |
| parent | 118a9069f06ff591d51a3133e242f0c256ba2db7 (diff) | |
| download | blackbird-op-linux-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.tar.gz blackbird-op-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/video')
| -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; |
