diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /drivers/video/backlight/locomolcd.c | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/video/backlight/locomolcd.c')
| -rw-r--r-- | drivers/video/backlight/locomolcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c index d1312477813e..6b488b8a7eee 100644 --- a/drivers/video/backlight/locomolcd.c +++ b/drivers/video/backlight/locomolcd.c | |||
| @@ -199,8 +199,8 @@ static int locomolcd_remove(struct locomo_dev *dev) | |||
| 199 | { | 199 | { |
| 200 | unsigned long flags; | 200 | unsigned long flags; |
| 201 | 201 | ||
| 202 | locomobl_data.brightness = 0; | 202 | locomolcd_bl_device->props.brightness = 0; |
| 203 | locomobl_data.power = 0; | 203 | locomolcd_bl_device->props.power = 0; |
| 204 | locomolcd_set_intensity(locomolcd_bl_device); | 204 | locomolcd_set_intensity(locomolcd_bl_device); |
| 205 | 205 | ||
| 206 | backlight_device_unregister(locomolcd_bl_device); | 206 | backlight_device_unregister(locomolcd_bl_device); |