diff options
author | Stefano Babic <sbabic@denx.de> | 2012-12-08 12:02:45 +0100 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2012-12-08 12:02:45 +0100 |
commit | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 (patch) | |
tree | 764536da9202b9de387a0d957829f64dfba818b7 /include/configs/mx35pdk.h | |
parent | 393ff47ba3123208f7c4f08d63f114300a41d0c4 (diff) | |
parent | fd4d564b3c80b111f18c93adb14233a6a7ddb0e9 (diff) | |
download | u-boot-05a860c228fe6c8f2e7aced8cc8ef88bc1038363.zip u-boot-05a860c228fe6c8f2e7aced8cc8ef88bc1038363.tar.gz u-boot-05a860c228fe6c8f2e7aced8cc8ef88bc1038363.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot into master
Conflicts:
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/woodburn_common.h
board/woodburn/woodburn.c
These boards still use the old old PMIC framework, so they
do not merge properly after the power framework was merged into
mainline.
Fix all conflicts and update woodburn to use Power Framework.
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'include/configs/mx35pdk.h')
-rw-r--r-- | include/configs/mx35pdk.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 1c2f599..88b2bd6 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -65,9 +65,9 @@ /* * PMIC Configs */ -#define CONFIG_PMIC -#define CONFIG_PMIC_I2C -#define CONFIG_PMIC_FSL +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_FSL #define CONFIG_PMIC_FSL_MC13892 #define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x08 #define CONFIG_RTC_MC13XXX |