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/ds1286.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/char/ds1286.c')
| -rw-r--r-- | drivers/char/ds1286.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c index d755cac14bc1..21c8229f5443 100644 --- a/drivers/char/ds1286.c +++ b/drivers/char/ds1286.c | |||
| @@ -281,7 +281,7 @@ static unsigned int ds1286_poll(struct file *file, poll_table *wait) | |||
| 281 | * The various file operations we support. | 281 | * The various file operations we support. |
| 282 | */ | 282 | */ |
| 283 | 283 | ||
| 284 | static struct file_operations ds1286_fops = { | 284 | static const struct file_operations ds1286_fops = { |
| 285 | .llseek = no_llseek, | 285 | .llseek = no_llseek, |
| 286 | .read = ds1286_read, | 286 | .read = ds1286_read, |
| 287 | .poll = ds1286_poll, | 287 | .poll = ds1286_poll, |