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

Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

Browse Source 
Conflicts:
	arch/arm/mach-omap2/pm34xx.c
This commit is contained in:
Tony Lindgren
2011-03-11 09:20:03 -08:00
parent 94a06b74e7 a08572ae52
commit a2358a7bc3
75 changed files with 3566 additions and 1947 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