diff options
author | Pekka Enberg <penberg@kernel.org> | 2011-09-19 16:46:07 +0200 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2011-09-19 16:46:07 +0200 |
commit | d20bbfab01802e195a50435940f7e4aa747c217c (patch) | |
tree | 82b0007e33c083050a4e60a49dbb2f5477b4c99d /drivers/acpi/video.c | |
parent | slub: doc: update the slabinfo.c file path (diff) | |
parent | slub: explicitly document position of inserting slab to partial list (diff) | |
download | linux-d20bbfab01802e195a50435940f7e4aa747c217c.tar.xz linux-d20bbfab01802e195a50435940f7e4aa747c217c.zip |
Merge branch 'slab/urgent' into slab/next
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r-- | drivers/acpi/video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index ada4b4d9bdc8..08a44b532f7c 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -307,7 +307,7 @@ video_set_cur_state(struct thermal_cooling_device *cooling_dev, unsigned long st return acpi_video_device_lcd_set_level(video, level); } -static struct thermal_cooling_device_ops video_cooling_ops = { +static const struct thermal_cooling_device_ops video_cooling_ops = { .get_max_state = video_get_max_state, .get_cur_state = video_get_cur_state, .set_cur_state = video_set_cur_state, |