diff options
author | Tony Lindgren | 2011-03-11 18:20:03 +0100 |
---|---|---|
committer | Tony Lindgren | 2011-03-11 18:20:03 +0100 |
commit | a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 (patch) | |
tree | fbdc2ddb066243a11aebc490c4d54e6a42be51e2 /arch/arm/mach-omap2/omap_twl.c | |
parent | Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/ke... (diff) | |
parent | Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integratio... (diff) | |
download | kernel-qcow2-linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.tar.gz kernel-qcow2-linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.tar.xz kernel-qcow2-linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.zip |
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 @@ #include <linux/kernel.h> #include <linux/i2c/twl.h> -#include <plat/voltage.h> +#include "voltage.h" #include "pm.h" |