diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /include/linux/pmu.h | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/pmu.h')
| -rw-r--r-- | include/linux/pmu.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/pmu.h b/include/linux/pmu.h index 217d3daf7336..2ed807ddc08c 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1998 Paul Mackerras. | 6 | * Copyright (C) 1998 Paul Mackerras. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #define PMU_DRIVER_VERSION 2 | 10 | #define PMU_DRIVER_VERSION 2 |
| 12 | 11 | ||
| @@ -231,4 +230,8 @@ extern int pmu_battery_count; | |||
| 231 | extern struct pmu_battery_info pmu_batteries[PMU_MAX_BATTERIES]; | 230 | extern struct pmu_battery_info pmu_batteries[PMU_MAX_BATTERIES]; |
| 232 | extern unsigned int pmu_power_flags; | 231 | extern unsigned int pmu_power_flags; |
| 233 | 232 | ||
| 233 | /* Backlight */ | ||
| 234 | extern int disable_kernel_backlight; | ||
| 235 | extern void pmu_backlight_init(struct device_node*); | ||
| 236 | |||
| 234 | #endif /* __KERNEL__ */ | 237 | #endif /* __KERNEL__ */ |