diff options
| author | Paul Walmsley | 2011-03-11 06:43:32 +0100 |
|---|---|---|
| committer | Paul Walmsley | 2011-03-11 06:43:32 +0100 |
| commit | a08572ae529b1e8de12393eeced661feae8fd44c (patch) | |
| tree | e9b48848ab72c953d778832336eb8e1d43abdc8d /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
| parent | Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.... (diff) | |
| parent | OMAP2+: voltage: reorganize, split code from data (diff) | |
| download | kernel-qcow2-linux-a08572ae529b1e8de12393eeced661feae8fd44c.tar.gz kernel-qcow2-linux-a08572ae529b1e8de12393eeced661feae8fd44c.tar.xz kernel-qcow2-linux-a08572ae529b1e8de12393eeced661feae8fd44c.zip | |
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> |