Merge branch 'next/soc2' into HEAD

[can-eth-gw-linux.git] / arch / arm / mach-mxs / include / mach / common.h

diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h
index 10e4e12df870b98824a09dff4792e885a53f1fff..be5a9c93cb2a849fa9c5f6f99d8637b140997d02 100644 (file)
--- a/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@ -17,22 +17,13 @@ extern void mxs_timer_init(void);
 extern void mxs_restart(char, const char *);
 extern int mxs_saif_clkmux_select(unsigned int clkmux);
 
-extern void mx23_soc_init(void);
 extern int mx23_clocks_init(void);
 extern void mx23_map_io(void);
-extern void mx23_init_irq(void);
 
-extern void mx28_soc_init(void);
 extern int mx28_clocks_init(void);
 extern void mx28_map_io(void);
-extern void mx28_init_irq(void);
 
 extern void icoll_init_irq(void);
 extern void icoll_handle_irq(struct pt_regs *);
 
-extern struct platform_device *mxs_add_dma(const char *devid,
-                                               resource_size_t base);
-extern struct platform_device *mxs_add_gpio(char *name, int id,
-                                           resource_size_t iobase, int irq);
-
 #endif /* __MACH_MXS_COMMON_H__ */