diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/s390/char/monreader.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/s390/char/monreader.c')
| -rw-r--r-- | drivers/s390/char/monreader.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c index e021ec663ef9..5b8b8592d311 100644 --- a/drivers/s390/char/monreader.c +++ b/drivers/s390/char/monreader.c | |||
| @@ -447,6 +447,7 @@ static const struct file_operations mon_fops = { | |||
| 447 | .release = &mon_close, | 447 | .release = &mon_close, |
| 448 | .read = &mon_read, | 448 | .read = &mon_read, |
| 449 | .poll = &mon_poll, | 449 | .poll = &mon_poll, |
| 450 | .llseek = noop_llseek, | ||
| 450 | }; | 451 | }; |
| 451 | 452 | ||
| 452 | static struct miscdevice mon_dev = { | 453 | static struct miscdevice mon_dev = { |