sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'pu/omap'

This commit is contained in:
Sascha Hauer 2011-10-14 09:36:10 +02:00
parent 2f74da06b4 3e5058e31f
commit 0092823005
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/panda_defconfig
View File

@ -17,7 +17,7 @@ CONFIG_AUTO_COMPLETE=y
# CONFIG_TIMESTAMP is not set
CONFIG_PARTITION=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm049/env"
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/panda/env"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y

2
drivers/mci/omap_hsmmc.c
View File

@ -569,7 +569,7 @@ static int omap_mmc_probe(struct device_d *dev)
hsmmc->mci.f_min = 400000;
pdata = (struct omap_hsmmc_platform_data *)dev->platform_data;
if (pdata->f_max)
if (pdata && pdata->f_max)
hsmmc->mci.f_max = pdata->f_max;
else
hsmmc->mci.f_max = 52000000;