diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 18:14:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 18:14:38 -0400 |
| commit | c80dc60b03d633047c7f96be87fd59cdcdbb929f (patch) | |
| tree | 1ef931c2287e376f8fef37cea89f7a951d9d3b00 /drivers/acpi/ec.c | |
| parent | 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab (diff) | |
| parent | 0466684907ea1695eeef98cb28ca3399882ecc0a (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: ACPI_DOCK: Initialize the atomic notifier list
ACPI: acpi_os_allocate() fixes
ACPI: SBS: fix initialization, sem2mutex
ACPI: add 'const' to several ACPI file_operations
ACPI: delete some defaults from ACPI Kconfig
ACPI: "Device `[%s]' is not power manageable" make message debug only
ACPI: ACPI_DOCK Kconfig
Revert "Revert "ACPI: dock driver""
ACPI: acpi_os_get_thread_id() returns current
ACPI: ACPICA 20060707
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, |