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/char/bfin-otp.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/char/bfin-otp.c')
| -rw-r--r-- | drivers/char/bfin-otp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/bfin-otp.c b/drivers/char/bfin-otp.c index 836d4f0a876f..44660f1c4849 100644 --- a/drivers/char/bfin-otp.c +++ b/drivers/char/bfin-otp.c | |||
| @@ -222,6 +222,7 @@ static const struct file_operations bfin_otp_fops = { | |||
| 222 | .unlocked_ioctl = bfin_otp_ioctl, | 222 | .unlocked_ioctl = bfin_otp_ioctl, |
| 223 | .read = bfin_otp_read, | 223 | .read = bfin_otp_read, |
| 224 | .write = bfin_otp_write, | 224 | .write = bfin_otp_write, |
| 225 | .llseek = default_llseek, | ||
| 225 | }; | 226 | }; |
| 226 | 227 | ||
| 227 | static struct miscdevice bfin_otp_misc_device = { | 228 | static struct miscdevice bfin_otp_misc_device = { |