summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/generic.h
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-02-01 23:43:03 +0100
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-03-31 20:36:09 +0200
commit1346919285933b881e169ede93e67abd226676aa (patch)
tree40e0629103d9df360d51efc82ab58f63ded91308 /arch/arm/mach-at91/generic.h
parent13f16017d3e3febdceba86e8634cf4d06d5c500c (diff)
downloadop-kernel-dev-1346919285933b881e169ede93e67abd226676aa.zip
op-kernel-dev-1346919285933b881e169ede93e67abd226676aa.tar.gz
ARM: at91: pm: Merge all at91sam9*_pm_init
The PM initialization is now identical for all at91sam9. Merge the functions. Acked-by: Wenyou Yang <wenyou.yang@atmel.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-at91/generic.h')
-rw-r--r--arch/arm/mach-at91/generic.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index 28ca57a..f1ead0f 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -13,15 +13,11 @@
#ifdef CONFIG_PM
extern void __init at91rm9200_pm_init(void);
-extern void __init at91sam9260_pm_init(void);
-extern void __init at91sam9g45_pm_init(void);
-extern void __init at91sam9x5_pm_init(void);
+extern void __init at91sam9_pm_init(void);
extern void __init sama5_pm_init(void);
#else
static inline void __init at91rm9200_pm_init(void) { }
-static inline void __init at91sam9260_pm_init(void) { }
-static inline void __init at91sam9g45_pm_init(void) { }
-static inline void __init at91sam9x5_pm_init(void) { }
+static inline void __init at91sam9_pm_init(void) { }
static inline void __init sama5_pm_init(void) { }
#endif
OpenPOWER on IntegriCloud