Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[tomoyo/tomoyo-test1.git] / arch / arm / mach-davinci / devices.c

diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index e650131..849e811 100644 (file)
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -17,7 +17,6 @@
 #include <mach/hardware.h>
 #include <mach/cputype.h>
 #include <mach/mux.h>
-#include <mach/time.h>
 
 #include "davinci.h"
 #include "irqs.h"
@@ -303,21 +302,3 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata)
        davinci_gpio_device.dev.platform_data = pdata;
        return platform_device_register(&davinci_gpio_device);
 }
-
-/*-------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------*/
-
-struct davinci_timer_instance davinci_timer_instance[2] = {
-       {
-               .base           = DAVINCI_TIMER0_BASE,
-               .bottom_irq     = DAVINCI_INTC_IRQ(IRQ_TINT0_TINT12),
-               .top_irq        = DAVINCI_INTC_IRQ(IRQ_TINT0_TINT34),
-       },
-       {
-               .base           = DAVINCI_TIMER1_BASE,
-               .bottom_irq     = DAVINCI_INTC_IRQ(IRQ_TINT1_TINT12),
-               .top_irq        = DAVINCI_INTC_IRQ(IRQ_TINT1_TINT34),
-       },
-};
-