GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 15:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt

Browse source 
Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolved as suggested by Jon Hunter.
This commit is contained in:
Tony Lindgren 2012-11-09 14:54:17 -08:00
commit f56f52e02a
328 changed files with 6118 additions and 5467 deletions
Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/mach-omap2/timer.c
View file

@ -45,10 +45,11 @@
#include <asm/sched_clock.h>
#include <asm/arch_timer.h>
#include <plat/omap_hwmod.h>
#include <plat/omap_device.h>
#include "omap_hwmod.h"
#include "omap_device.h"
#include <plat/counter-32k.h>
#include <plat/dmtimer.h>
#include <plat/omap-pm.h>
#include "omap-pm.h"
#include "soc.h"
#include "common.h"
@ -692,6 +693,8 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
if (timer_dev_attr)
pdata->timer_capability = timer_dev_attr->timer_capability;
pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;
pdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata),
NULL, 0, 0);