diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-11 12:20:03 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-11 12:20:03 -0500 |
| commit | a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 (patch) | |
| tree | fbdc2ddb066243a11aebc490c4d54e6a42be51e2 /arch/arm/mach-omap2/omap_twl.c | |
| parent | 94a06b74e724caabcf0464c81527cfbcae0c8aff (diff) | |
| parent | a08572ae529b1e8de12393eeced661feae8fd44c (diff) | |
Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/arm/mach-omap2/omap_twl.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_twl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c index b341c36a93f3..0a8e74e3e811 100644 --- a/arch/arm/mach-omap2/omap_twl.c +++ b/arch/arm/mach-omap2/omap_twl.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/i2c/twl.h> | 19 | #include <linux/i2c/twl.h> |
| 20 | 20 | ||
| 21 | #include <plat/voltage.h> | 21 | #include "voltage.h" |
| 22 | 22 | ||
| 23 | #include "pm.h" | 23 | #include "pm.h" |
| 24 | 24 | ||