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/pc8736x_gpio.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/pc8736x_gpio.c')
| -rw-r--r-- | drivers/char/pc8736x_gpio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c index 8ecbcc174c15..b304ec052501 100644 --- a/drivers/char/pc8736x_gpio.c +++ b/drivers/char/pc8736x_gpio.c | |||
| @@ -234,6 +234,7 @@ static const struct file_operations pc8736x_gpio_fileops = { | |||
| 234 | .open = pc8736x_gpio_open, | 234 | .open = pc8736x_gpio_open, |
| 235 | .write = nsc_gpio_write, | 235 | .write = nsc_gpio_write, |
| 236 | .read = nsc_gpio_read, | 236 | .read = nsc_gpio_read, |
| 237 | .llseek = no_llseek, | ||
| 237 | }; | 238 | }; |
| 238 | 239 | ||
| 239 | static void __init pc8736x_init_shadow(void) | 240 | static void __init pc8736x_init_shadow(void) |