Merge branch 'ux500/soc' into ux500/dt

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-ux500 / include / mach / setup.h

diff --git a/arch/arm/mach-ux500/include/mach/setup.h b/arch/arm/mach-ux500/include/mach/setup.h
index 74b43bb745420fc695cf7878d575b1af0ad0144d..3dc00ffa7bfa5d54772dc5201757b1c3ff12bc27 100644 (file)
--- a/arch/arm/mach-ux500/include/mach/setup.h
+++ b/arch/arm/mach-ux500/include/mach/setup.h
@@ -29,9 +29,6 @@ extern void __init db5500_dma_init(struct device *parent);
 
 extern struct device *ux500_soc_device_init(const char *soc_id);
 
-/* We re-use nomadik_timer for this platform */
-extern void nmdk_timer_init(void);
-
 struct amba_device;
 extern void __init amba_add_devices(struct amba_device *devs[], int num);