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 /drivers/telephony/phonedev.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/telephony/phonedev.c')
| -rw-r--r-- | drivers/telephony/phonedev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c index 7a6db1c5c8c5..e166fffea86b 100644 --- a/drivers/telephony/phonedev.c +++ b/drivers/telephony/phonedev.c | |||
| @@ -49,7 +49,7 @@ static int phone_open(struct inode *inode, struct file *file) | |||
| 49 | unsigned int minor = iminor(inode); | 49 | unsigned int minor = iminor(inode); |
| 50 | int err = 0; | 50 | int err = 0; |
| 51 | struct phone_device *p; | 51 | struct phone_device *p; |
| 52 | struct file_operations *old_fops, *new_fops = NULL; | 52 | const struct file_operations *old_fops, *new_fops = NULL; |
| 53 | 53 | ||
| 54 | if (minor >= PHONE_NUM_DEVICES) | 54 | if (minor >= PHONE_NUM_DEVICES) |
| 55 | return -ENODEV; | 55 | return -ENODEV; |