diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/acpi/ec.c | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 8c5d7df7d343..e5d796362854 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -929,7 +929,7 @@ static int acpi_ec_info_open_fs(struct inode *inode, struct file *file) | |||
| 929 | return single_open(file, acpi_ec_read_info, PDE(inode)->data); | 929 | return single_open(file, acpi_ec_read_info, PDE(inode)->data); |
| 930 | } | 930 | } |
| 931 | 931 | ||
| 932 | static struct file_operations acpi_ec_info_ops = { | 932 | static const struct file_operations acpi_ec_info_ops = { |
| 933 | .open = acpi_ec_info_open_fs, | 933 | .open = acpi_ec_info_open_fs, |
| 934 | .read = seq_read, | 934 | .read = seq_read, |
| 935 | .llseek = seq_lseek, | 935 | .llseek = seq_lseek, |