diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 (patch) | |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 /include/asm-powerpc/backlight.h | |
| parent | 58b3ac07fed31ffc1349380b78305af6522fe1f4 (diff) | |
| parent | 6e1e63259b1e01f047796e7985d960ca040993e6 (diff) | |
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-powerpc/backlight.h')
| -rw-r--r-- | include/asm-powerpc/backlight.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-powerpc/backlight.h b/include/asm-powerpc/backlight.h index 58d4b6f8d827..8cf5c37c3817 100644 --- a/include/asm-powerpc/backlight.h +++ b/include/asm-powerpc/backlight.h | |||
| @@ -30,8 +30,12 @@ static inline void pmac_backlight_key_down(void) | |||
| 30 | pmac_backlight_key(1); | 30 | pmac_backlight_key(1); |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | extern void pmac_backlight_set_legacy_brightness_pmu(int brightness); | ||
| 33 | extern int pmac_backlight_set_legacy_brightness(int brightness); | 34 | extern int pmac_backlight_set_legacy_brightness(int brightness); |
| 34 | extern int pmac_backlight_get_legacy_brightness(void); | 35 | extern int pmac_backlight_get_legacy_brightness(void); |
| 35 | 36 | ||
| 37 | extern void pmac_backlight_enable(void); | ||
| 38 | extern void pmac_backlight_disable(void); | ||
| 39 | |||
| 36 | #endif /* __KERNEL__ */ | 40 | #endif /* __KERNEL__ */ |
| 37 | #endif | 41 | #endif |