diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /drivers/acpi/button.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/acpi/button.c')
| -rw-r--r-- | drivers/acpi/button.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index fd1ba05eab68..5ef885e82c78 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c | |||
| @@ -87,14 +87,14 @@ struct acpi_button { | |||
| 87 | unsigned long pushed; | 87 | unsigned long pushed; |
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | static struct file_operations acpi_button_info_fops = { | 90 | static const struct file_operations acpi_button_info_fops = { |
| 91 | .open = acpi_button_info_open_fs, | 91 | .open = acpi_button_info_open_fs, |
| 92 | .read = seq_read, | 92 | .read = seq_read, |
| 93 | .llseek = seq_lseek, | 93 | .llseek = seq_lseek, |
| 94 | .release = single_release, | 94 | .release = single_release, |
| 95 | }; | 95 | }; |
| 96 | 96 | ||
| 97 | static struct file_operations acpi_button_state_fops = { | 97 | static const struct file_operations acpi_button_state_fops = { |
| 98 | .open = acpi_button_state_open_fs, | 98 | .open = acpi_button_state_open_fs, |
| 99 | .read = seq_read, | 99 | .read = seq_read, |
| 100 | .llseek = seq_lseek, | 100 | .llseek = seq_lseek, |