diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 21:01:35 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 21:01:35 +0200 |
| commit | c9aab0f9dd23fddcebf5984dc19e62b514e759a7 (patch) | |
| tree | 65ce91815907466f07e87d8b79eaf19763c282bf /arch/arm/cpu/arm926ejs/davinci/dm644x.c | |
| parent | 94b972d366c29b92319865e3ded16da062aa8507 (diff) | |
| parent | 2e8f5dc16ad360cc15ea402a1dc4d421a04adbbd (diff) | |
| download | talos-obmc-uboot-c9aab0f9dd23fddcebf5984dc19e62b514e759a7.tar.gz talos-obmc-uboot-c9aab0f9dd23fddcebf5984dc19e62b514e759a7.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/arm926ejs/davinci/dm644x.c')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/davinci/dm644x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/davinci/dm644x.c b/arch/arm/cpu/arm926ejs/davinci/dm644x.c index 788e57840f..c58e271e28 100644 --- a/arch/arm/cpu/arm926ejs/davinci/dm644x.c +++ b/arch/arm/cpu/arm926ejs/davinci/dm644x.c @@ -47,7 +47,7 @@ void davinci_enable_emac(void) } #endif -#ifdef CONFIG_DRIVER_DAVINCI_I2C +#ifdef CONFIG_SYS_I2C_DAVINCI void davinci_enable_i2c(void) { lpsc_on(DAVINCI_LPSC_I2C); |
