From 77bce0f6ad762e9959450b17f1e221208852a36c Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 18 Sep 2011 18:11:11 +0000 Subject: [PATCH] Generalize conditional compilation setting git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3962 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/stm32/stm32_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c index c7301c60372..a46cc4af99a 100644 --- a/arch/arm/src/stm32/stm32_i2c.c +++ b/arch/arm/src/stm32/stm32_i2c.c @@ -1409,7 +1409,7 @@ static int stm32_i2c_process(FAR struct i2c_dev_s *dev, FAR struct i2c_msg_s *ms * will not complete normally if the FSMC is enabled. */ -#ifndef CONFIG_STM32_I2C1 +#if !defined(CONFIG_STM32_FSMC) || !defined (CONFIG_STM32_I2C1) stm32_i2c_sem_waitstop(priv); #endif @@ -1550,7 +1550,7 @@ static int stm32_i2c_process(FAR struct i2c_dev_s *dev, FAR struct i2c_msg_s *ms * will not complete normally if the FSMC is enabled. */ -#ifdef CONFIG_STM32_I2C1 +#if defined(CONFIG_STM32_FSMC) && defined (CONFIG_STM32_I2C1) stm32_i2c_sem_waitstop(priv); #endif