summaryrefslogtreecommitdiff
path: root/include/linux/cdev.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2004-02-08 23:39:44 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-08 23:39:44 -0800
commit9ccf07316dc2a21d829a5226cd70731206bc3e30 (patch)
treed71ddb44f369e5d7e2382756276b37c2a7f11340 /include/linux/cdev.h
parent90c9ddf63e118c842c9e401cd11a779cdc08a374 (diff)
parent8be9c8deeca2eebf6dbc55fa2b0a19517d47ff1a (diff)
Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/cdev.h')
-rw-r--r--include/linux/cdev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cdev.h b/include/linux/cdev.h
index 191c800fa127..f1996ec09e96 100644
--- a/include/linux/cdev.h
+++ b/include/linux/cdev.h
@@ -7,6 +7,8 @@ struct cdev {
struct module *owner;
struct file_operations *ops;
struct list_head list;
+ dev_t dev;
+ unsigned int count;
};
void cdev_init(struct cdev *, struct file_operations *);
@@ -21,8 +23,6 @@ int cdev_add(struct cdev *, dev_t, unsigned);
void cdev_del(struct cdev *);
-void cdev_unmap(dev_t, unsigned);
-
void cd_forget(struct inode *);
#endif