diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/video/chipsfb.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/video/chipsfb.c')
| -rw-r--r-- | drivers/video/chipsfb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c index 0e465c80ef24..73cb426bf2d7 100644 --- a/drivers/video/chipsfb.c +++ b/drivers/video/chipsfb.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/tty.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/vmalloc.h> | 23 | #include <linux/vmalloc.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| @@ -150,12 +149,11 @@ static int chipsfb_blank(int blank, struct fb_info *info) | |||
| 150 | mutex_lock(&pmac_backlight_mutex); | 149 | mutex_lock(&pmac_backlight_mutex); |
| 151 | 150 | ||
| 152 | if (pmac_backlight) { | 151 | if (pmac_backlight) { |
| 153 | down(&pmac_backlight->sem); | ||
| 154 | |||
| 155 | /* used to disable backlight only for blank > 1, but it seems | 152 | /* used to disable backlight only for blank > 1, but it seems |
| 156 | * useful at blank = 1 too (saves battery, extends backlight | 153 | * useful at blank = 1 too (saves battery, extends backlight |
| 157 | * life) | 154 | * life) |
| 158 | */ | 155 | */ |
| 156 | down(&pmac_backlight->sem); | ||
| 159 | if (blank) | 157 | if (blank) |
| 160 | pmac_backlight->props->power = FB_BLANK_POWERDOWN; | 158 | pmac_backlight->props->power = FB_BLANK_POWERDOWN; |
| 161 | else | 159 | else |