diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /include/linux/miscdevice.h | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/linux/miscdevice.h')
| -rw-r--r-- | include/linux/miscdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 14ceebfc1efa..5b584dafb5a6 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -36,7 +36,7 @@ struct class_device; | |||
| 36 | struct miscdevice { | 36 | struct miscdevice { |
| 37 | int minor; | 37 | int minor; |
| 38 | const char *name; | 38 | const char *name; |
| 39 | struct file_operations *fops; | 39 | const struct file_operations *fops; |
| 40 | struct list_head list; | 40 | struct list_head list; |
| 41 | struct device *dev; | 41 | struct device *dev; |
| 42 | struct class_device *class; | 42 | struct class_device *class; |