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
This commit is contained in:
@@ -176,21 +176,21 @@ struct acpi_thermal {
|
||||
struct timer_list timer;
|
||||
};
|
||||
|
||||
static struct file_operations acpi_thermal_state_fops = {
|
||||
static const struct file_operations acpi_thermal_state_fops = {
|
||||
.open = acpi_thermal_state_open_fs,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
static struct file_operations acpi_thermal_temp_fops = {
|
||||
static const struct file_operations acpi_thermal_temp_fops = {
|
||||
.open = acpi_thermal_temp_open_fs,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
static struct file_operations acpi_thermal_trip_fops = {
|
||||
static const struct file_operations acpi_thermal_trip_fops = {
|
||||
.open = acpi_thermal_trip_open_fs,
|
||||
.read = seq_read,
|
||||
.write = acpi_thermal_write_trip_points,
|
||||
@@ -198,7 +198,7 @@ static struct file_operations acpi_thermal_trip_fops = {
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
static struct file_operations acpi_thermal_cooling_fops = {
|
||||
static const struct file_operations acpi_thermal_cooling_fops = {
|
||||
.open = acpi_thermal_cooling_open_fs,
|
||||
.read = seq_read,
|
||||
.write = acpi_thermal_write_cooling_mode,
|
||||
@@ -206,7 +206,7 @@ static struct file_operations acpi_thermal_cooling_fops = {
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
static struct file_operations acpi_thermal_polling_fops = {
|
||||
static const struct file_operations acpi_thermal_polling_fops = {
|
||||
.open = acpi_thermal_polling_open_fs,
|
||||
.read = seq_read,
|
||||
.write = acpi_thermal_write_polling,
|
||||
|
Reference in New Issue
Block a user