diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/char_dev.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/char_dev.c')
| -rw-r--r-- | fs/char_dev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index 038674aa88a7..68e510b88457 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
| @@ -55,7 +55,6 @@ static struct char_device_struct { | |||
| 55 | unsigned int baseminor; | 55 | unsigned int baseminor; |
| 56 | int minorct; | 56 | int minorct; |
| 57 | char name[64]; | 57 | char name[64]; |
| 58 | struct file_operations *fops; | ||
| 59 | struct cdev *cdev; /* will die */ | 58 | struct cdev *cdev; /* will die */ |
| 60 | } *chrdevs[CHRDEV_MAJOR_HASH_SIZE]; | 59 | } *chrdevs[CHRDEV_MAJOR_HASH_SIZE]; |
| 61 | 60 | ||