diff --git a/arch/arm/src/lpc17xx/lpc17_emacram.h b/arch/arm/src/lpc17xx/lpc17_emacram.h index 5e8df85b318..0a47636e20c 100644 --- a/arch/arm/src/lpc17xx/lpc17_emacram.h +++ b/arch/arm/src/lpc17xx/lpc17_emacram.h @@ -75,13 +75,13 @@ /* Number of Tx descriptors */ #ifndef CONFIG_NET_NTXDESC -# define CONFIG_NET_NTXDESC 18 +# define CONFIG_NET_NTXDESC 13 #endif /* Number of Rx descriptors */ #ifndef CONFIG_NET_NRXDESC -# define CONFIG_NET_NRXDESC 18 +# define CONFIG_NET_NRXDESC 13 #endif /* Size of the region at the beginning of AHB SRAM 0 set set aside for the EMAC. diff --git a/arch/arm/src/lpc17xx/lpc17_spi.h b/arch/arm/src/lpc17xx/lpc17_spi.h index 8345f46deb9..2f0c0fe8af6 100644 --- a/arch/arm/src/lpc17xx/lpc17_spi.h +++ b/arch/arm/src/lpc17xx/lpc17_spi.h @@ -157,8 +157,8 @@ void spi_flush(FAR struct spi_dev_s *dev); ****************************************************************************/ #ifdef CONFIG_SPI_CALLBACK -nt lpc17_spiregister(FAR struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); +int lpc17_spiregister(FAR struct spi_dev_s *dev, spi_mediachange_t callback, + FAR void *arg); #endif #if defined(__cplusplus) diff --git a/configs b/configs index aa907bc50d5..7e1508fa58d 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit aa907bc50d567fc546b53e4deeeaf751a5a65f79 +Subproject commit 7e1508fa58d6e44144f58f141ef7a7916b9ce73c