Resolve conflict

2014-10-27 08:00:10 -06:00 · 2014-10-27 08:00:10 -06:00 · 6a49bbaf8d
commit 6a49bbaf8d
parent b8e84e2dce 03663a7ac4
1 changed files with 1 additions and 1 deletions
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@ -169,7 +169,7 @@ struct efm32_spidev_s
  uint8_t mode;              /* Mode 0,1,2,3 */
 #endif

-  uint8_t nbits;             /* Width of word in bits (8 or 16) */
+  uint8_t nbits;             /* Width of word in bits (4-16) */
  bool initialized;          /* True: Already initialized */
 };