diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /drivers/char/lp.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/char/lp.c')
| -rw-r--r-- | drivers/char/lp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/lp.c b/drivers/char/lp.c index 582cdbdb0c42..f875fda3b089 100644 --- a/drivers/char/lp.c +++ b/drivers/char/lp.c | |||
| @@ -666,7 +666,7 @@ static int lp_ioctl(struct inode *inode, struct file *file, | |||
| 666 | return retval; | 666 | return retval; |
| 667 | } | 667 | } |
| 668 | 668 | ||
| 669 | static struct file_operations lp_fops = { | 669 | static const struct file_operations lp_fops = { |
| 670 | .owner = THIS_MODULE, | 670 | .owner = THIS_MODULE, |
| 671 | .write = lp_write, | 671 | .write = lp_write, |
| 672 | .ioctl = lp_ioctl, | 672 | .ioctl = lp_ioctl, |