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/watchdog/ep93xx_wdt.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/watchdog/ep93xx_wdt.c')
| -rw-r--r-- | drivers/watchdog/ep93xx_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 59359c9a5e01..726b7df61fd0 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c | |||
| @@ -188,6 +188,7 @@ static const struct file_operations ep93xx_wdt_fops = { | |||
| 188 | .unlocked_ioctl = ep93xx_wdt_ioctl, | 188 | .unlocked_ioctl = ep93xx_wdt_ioctl, |
| 189 | .open = ep93xx_wdt_open, | 189 | .open = ep93xx_wdt_open, |
| 190 | .release = ep93xx_wdt_release, | 190 | .release = ep93xx_wdt_release, |
| 191 | .llseek = no_llseek, | ||
| 191 | }; | 192 | }; |
| 192 | 193 | ||
| 193 | static struct miscdevice ep93xx_wdt_miscdev = { | 194 | static struct miscdevice ep93xx_wdt_miscdev = { |