diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 |
| commit | 02b311bce9fc87987a123adc3e6a2d0a2caa70e2 (patch) | |
| tree | ba5c42ecf98de1a1a72f4bd5d94dc729ca8196c9 /include/linux/pmu.h | |
| parent | 8f0f850e240df5bea027caeb1723142c50e37e57 (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/pmu.h')
| -rw-r--r-- | include/linux/pmu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/pmu.h b/include/linux/pmu.h index 2ed807ddc08c..783177387ac6 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h | |||
| @@ -231,7 +231,6 @@ extern struct pmu_battery_info pmu_batteries[PMU_MAX_BATTERIES]; | |||
| 231 | extern unsigned int pmu_power_flags; | 231 | extern unsigned int pmu_power_flags; |
| 232 | 232 | ||
| 233 | /* Backlight */ | 233 | /* Backlight */ |
| 234 | extern int disable_kernel_backlight; | 234 | extern void pmu_backlight_init(void); |
| 235 | extern void pmu_backlight_init(struct device_node*); | ||
| 236 | 235 | ||
| 237 | #endif /* __KERNEL__ */ | 236 | #endif /* __KERNEL__ */ |