summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include/mach/common.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-12 15:17:14 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-12 15:17:14 +0200
commit620f2efcdc5c7a2db68da41bc3df3cf9a718024e (patch)
treeb1a0411e2588953777d0b10245b12044c33cef54 /arch/arm/plat-mxc/include/mach/common.h
parent04944b793e18ece23f63c0252646b310c1845940 (diff)
parentfd048088306656824958e7783ffcee27e241b361 (diff)
downloadop-kernel-dev-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.zip
op-kernel-dev-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.tar.gz
Merge branch 'linus' into x86/xsave
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/common.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/common.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h
index a6d2e24..6350287 100644
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@ -11,10 +11,13 @@
#ifndef __ASM_ARCH_MXC_COMMON_H__
#define __ASM_ARCH_MXC_COMMON_H__
+struct platform_device;
+
extern void mxc_map_io(void);
extern void mxc_init_irq(void);
extern void mxc_timer_init(const char *clk_timer);
extern int mxc_clocks_init(unsigned long fref);
extern int mxc_register_gpios(void);
+extern int mxc_register_device(struct platform_device *pdev, void *data);
#endif
OpenPOWER on IntegriCloud