diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /fs/devices.c | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'fs/devices.c')
| -rw-r--r-- | fs/devices.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/devices.c b/fs/devices.c index 2c53934b9..d119b1c75 100644 --- a/fs/devices.c +++ b/fs/devices.c @@ -17,6 +17,7 @@ #include <linux/stat.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/module.h> #ifdef CONFIG_KMOD #include <linux/kmod.h> @@ -142,8 +143,9 @@ int chrdev_open(struct inode * inode, struct file * filp) { int ret = -ENODEV; - filp->f_op = get_chrfops(MAJOR(inode->i_rdev), MINOR(inode->i_rdev)); - if (filp->f_op != NULL){ + filp->f_op = fops_get(get_chrfops(MAJOR(inode->i_rdev), + MINOR(inode->i_rdev))); + if (filp->f_op) { ret = 0; if (filp->f_op->open != NULL) ret = filp->f_op->open(inode,filp); |