forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2.6.39-20110310-024

Browse source 
Conflicts:
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
This commit is contained in:
Paul Walmsley 2011-03-10 22:43:32 -07:00
commit a08572ae52
22 changed files with 1239 additions and 791 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/plat-omap/include/plat/omap_hwmod.h
View file

@ -35,7 +35,6 @@
#include <linux/ioport.h>
#include <linux/spinlock.h>
#include <plat/cpu.h>
#include <plat/voltage.h>
struct omap_device;