Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48b00236 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'cleanup-timer' of git://github.com/jonhunter/linux into omap-for-v3.8/timer

parents 9dc57643 258e84af

arch/arm/mach-omap1/timer.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/err.h>

#include <linux/slab.h>

#include <linux/platform_device.h>

#include <linux/platform_data/dmtimer-omap.h>



#include <mach/irqs.h>

arch/arm/mach-omap1/timer32k.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <asm/mach/time.h>



#include <plat/counter-32k.h>

#include <plat/dmtimer.h>



#include <mach/hardware.h>

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/platform_data/spi-omap2-mcspi.h>



#include <plat-omap/dma-omap.h>

#include <plat/dmtimer.h>



#include "omap_hwmod.h"

#include "l3_2xxx.h"

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/platform_data/spi-omap2-mcspi.h>



#include <plat-omap/dma-omap.h>

#include <plat/dmtimer.h>



#include "omap_hwmod.h"

#include "mmc.h"

arch/arm/mach-omap2/pm-debug.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "clock.h"

#include "powerdomain.h"

#include "clockdomain.h"

#include <plat/dmtimer.h>

#include "omap-pm.h"



#include "soc.h"