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/acpi/event.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/acpi/event.c')
| -rw-r--r-- | drivers/acpi/event.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index d439314a75d8..85d908993809 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c | |||
| @@ -110,6 +110,7 @@ static const struct file_operations acpi_system_event_ops = { | |||
| 110 | .read = acpi_system_read_event, | 110 | .read = acpi_system_read_event, |
| 111 | .release = acpi_system_close_event, | 111 | .release = acpi_system_close_event, |
| 112 | .poll = acpi_system_poll_event, | 112 | .poll = acpi_system_poll_event, |
| 113 | .llseek = default_llseek, | ||
| 113 | }; | 114 | }; |
| 114 | #endif /* CONFIG_ACPI_PROC_EVENT */ | 115 | #endif /* CONFIG_ACPI_PROC_EVENT */ |
| 115 | 116 | ||