diff options
| author | Dmitry Eremin-Solenikov | 2009-03-28 16:18:52 +0100 |
|---|---|---|
| committer | Eric Miao | 2009-06-11 16:20:42 +0200 |
| commit | d48898a3c88c1f36a66a8d4e3e45843c3171c548 (patch) | |
| tree | 149a8f83108a1b8528380ae8630b200ef29e6594 /arch/arm/mach-pxa/include | |
| parent | [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific (diff) | |
| download | kernel-qcow2-linux-d48898a3c88c1f36a66a8d4e3e45843c3171c548.tar.gz kernel-qcow2-linux-d48898a3c88c1f36a66a8d4e3e45843c3171c548.tar.xz kernel-qcow2-linux-d48898a3c88c1f36a66a8d4e3e45843c3171c548.zip | |
[ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
As pxa now is the only user of sharpsl_pm we can drop several startup
functions into generic code thus dropping several global functions.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/include')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/sharpsl_pm.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/include/mach/sharpsl_pm.h b/arch/arm/mach-pxa/include/mach/sharpsl_pm.h index 2d00db22b981..1920dc6b05dc 100644 --- a/arch/arm/mach-pxa/include/mach/sharpsl_pm.h +++ b/arch/arm/mach-pxa/include/mach/sharpsl_pm.h @@ -8,8 +8,8 @@ * published by the Free Software Foundation. * */ - -#include <linux/interrupt.h> +#ifndef _MACH_SHARPSL_PM +#define _MACH_SHARPSL_PM struct sharpsl_charger_machinfo { void (*init)(void); @@ -100,7 +100,5 @@ extern struct sharpsl_pm_status sharpsl_pm; void sharpsl_battery_kick(void); void sharpsl_pm_led(int val); -irqreturn_t sharpsl_ac_isr(int irq, void *dev_id); -irqreturn_t sharpsl_chrg_full_isr(int irq, void *dev_id); -irqreturn_t sharpsl_fatal_isr(int irq, void *dev_id); +#endif |