diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-18 18:11:11 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-18 18:11:11 +0000 |
| commit | 6e648ecc1c26ee3345ef5af63ca294e3fa2302b7 (patch) | |
| tree | 99eaa7db4fc9d3370b3f6d68fd2209218b82db33 /nuttx | |
| parent | 0ce69264dbb1841b4093c04302c53ccfab02ca48 (diff) | |
| download | px4-nuttx-6e648ecc1c26ee3345ef5af63ca294e3fa2302b7.tar.gz px4-nuttx-6e648ecc1c26ee3345ef5af63ca294e3fa2302b7.tar.bz2 px4-nuttx-6e648ecc1c26ee3345ef5af63ca294e3fa2302b7.zip | |
Generalize conditional compilation setting
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3962 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_i2c.c b/nuttx/arch/arm/src/stm32/stm32_i2c.c index c7301c603..a46cc4af9 100644 --- a/nuttx/arch/arm/src/stm32/stm32_i2c.c +++ b/nuttx/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 |