diff options
author | Paul Walmsley <paul@pwsan.com> | 2011-03-11 08:43:32 +0300 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2011-03-11 08:43:32 +0300 |
commit | a08572ae529b1e8de12393eeced661feae8fd44c (patch) | |
tree | e9b48848ab72c953d778832336eb8e1d43abdc8d /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
parent | 2d403fe03070b541cc93cfa915f6e6c592cf231c (diff) | |
parent | c0718df4d666cc5fd8837ac93c82995a17bfdbf5 (diff) | |
download | linux-a08572ae529b1e8de12393eeced661feae8fd44c.tar.xz |
Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2.6.39-20110310-024
Conflicts:
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 17b4fb8c3479..c819c306693a 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -23,7 +23,6 @@ #include <plat/i2c.h> #include <plat/gpio.h> #include <plat/mmc.h> -#include <plat/smartreflex.h> #include <plat/mcbsp.h> #include <plat/mcspi.h> #include <plat/dmtimer.h> |