git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pnp
/
isapnp
/
proc.c
diff --git
a/drivers/pnp/isapnp/proc.c
b/drivers/pnp/isapnp/proc.c
index
0a94ee9
..
d21f3c1
100644
(file)
--- a/
drivers/pnp/isapnp/proc.c
+++ b/
drivers/pnp/isapnp/proc.c
@@
-19,7
+19,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/isapnp.h>
#include <linux/proc_fs.h>
#include <linux/module.h>
#include <linux/isapnp.h>
#include <linux/proc_fs.h>
@@
-55,9
+54,9
@@
static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence)
return (file->f_pos = new);
}
return (file->f_pos = new);
}
-static ssize_t isapnp_proc_bus_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos)
+static ssize_t isapnp_proc_bus_read(struct file *file, char
__user
*buf, size_t nbytes, loff_t *ppos)
{
{
- struct inode *ino = file->f_dentry->d_inode;
+ struct inode *ino = file->f_
path.
dentry->d_inode;
struct proc_dir_entry *dp = PDE(ino);
struct pnp_dev *dev = dp->data;
int pos = *ppos;
struct proc_dir_entry *dp = PDE(ino);
struct pnp_dev *dev = dp->data;
int pos = *ppos;