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 /samples/kfifo/bytestream-example.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 'samples/kfifo/bytestream-example.c')
| -rw-r--r-- | samples/kfifo/bytestream-example.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/samples/kfifo/bytestream-example.c b/samples/kfifo/bytestream-example.c index 178061e87ffe..cfe40addda76 100644 --- a/samples/kfifo/bytestream-example.c +++ b/samples/kfifo/bytestream-example.c | |||
| @@ -148,6 +148,7 @@ static const struct file_operations fifo_fops = { | |||
| 148 | .owner = THIS_MODULE, | 148 | .owner = THIS_MODULE, |
| 149 | .read = fifo_read, | 149 | .read = fifo_read, |
| 150 | .write = fifo_write, | 150 | .write = fifo_write, |
| 151 | .llseek = noop_llseek, | ||
| 151 | }; | 152 | }; |
| 152 | 153 | ||
| 153 | static int __init example_init(void) | 154 | static int __init example_init(void) |