diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /include/linux/cdev.h | |
| parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
| parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/cdev.h')
| -rw-r--r-- | include/linux/cdev.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/cdev.h b/include/linux/cdev.h index f389e319a45..fb4591977b0 100644 --- a/include/linux/cdev.h +++ b/include/linux/cdev.h | |||
| @@ -28,8 +28,6 @@ int cdev_add(struct cdev *, dev_t, unsigned); | |||
| 28 | 28 | ||
| 29 | void cdev_del(struct cdev *); | 29 | void cdev_del(struct cdev *); |
| 30 | 30 | ||
| 31 | int cdev_index(struct inode *inode); | ||
| 32 | |||
| 33 | void cd_forget(struct inode *); | 31 | void cd_forget(struct inode *); |
| 34 | 32 | ||
| 35 | extern struct backing_dev_info directly_mappable_cdev_bdi; | 33 | extern struct backing_dev_info directly_mappable_cdev_bdi; |