lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
parent 2d403fe030 c0718df4d6
commit a08572ae52
22 changed files with 1239 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/smartreflex.c
View File

@@ -26,9 +26,9 @@
#include <linux/pm_runtime.h>
#include <plat/common.h>
#include <plat/smartreflex.h>
#include "pm.h"
#include "smartreflex.h"
#define SMARTREFLEX_NAME_LEN 16
#define NVALUE_NAME_LEN 40