diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /include/linux/pmu.h | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.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 | 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__ */ |