summaryrefslogtreecommitdiff
path: root/arch/arm/mach-nomadik/include/mach/setup.h
diff options
context:
space:
mode:
authorSrinidhi Kasagar <srinidhi.kasagar@stericsson.com>2009-11-12 08:20:54 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-11-28 13:22:51 +0300
commit59b559d7a39b590aecef583af58d123ff5876570 (patch)
tree5e5f17bea4e3eb0295e6d85dc72334f23bbc9338 /arch/arm/mach-nomadik/include/mach/setup.h
parenta8a8a669ea13d792296737505adc43ccacf3a648 (diff)
downloadlinux-59b559d7a39b590aecef583af58d123ff5876570.tar.xz
ARM: 5786/1: Introduce plat-nomadik, MTU code re-organization
Introduce the plat-nomadik folder for ST-Ericsson machines including the existing nomadik 8815 architecture. This also moves the existing MTU (MultiTimerUnit) of nomadik 8815 to the proposed plat-nomadik and adds HAS_MTU. The patch has been re-based to 2.6.32-rc6 Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> Acked-by: Alessandro Rubini <rubini@unipv.it> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-nomadik/include/mach/setup.h')
-rw-r--r--arch/arm/mach-nomadik/include/mach/setup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-nomadik/include/mach/setup.h b/arch/arm/mach-nomadik/include/mach/setup.h
index a4e468cf63da..b7897edf1f35 100644
--- a/arch/arm/mach-nomadik/include/mach/setup.h
+++ b/arch/arm/mach-nomadik/include/mach/setup.h
@@ -15,7 +15,7 @@
extern void cpu8815_map_io(void);
extern void cpu8815_platform_init(void);
extern void cpu8815_init_irq(void);
-extern struct sys_timer nomadik_timer;
+extern void nmdk_timer_init(void);
#endif /* NOMADIK_8815 */