diff --git a/arch/arm/src/lpc11xx/Kconfig b/arch/arm/src/lpc11xx/Kconfig index 5bab142af20..255273a3a2e 100644 --- a/arch/arm/src/lpc11xx/Kconfig +++ b/arch/arm/src/lpc11xx/Kconfig @@ -196,7 +196,7 @@ config CAN_TSEG2 ---help--- The number of CAN time quanta in segment 2. Default: 7 -config CAN_SAM +config LPC11_CAN_SAM bool "CAN sampling" default n ---help--- diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig index a24f900ad4a..fe97c0394ee 100644 --- a/arch/arm/src/lpc17xx/Kconfig +++ b/arch/arm/src/lpc17xx/Kconfig @@ -584,7 +584,7 @@ config CAN_TSEG2 ---help--- The number of CAN time quanta in segment 2. Default: 7 -config CAN_SAM +config LPC17_CAN_SAM bool "CAN sampling" default n ---help--- diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c index ffdba8d1aed..f122ffedef2 100644 --- a/arch/arm/src/lpc17xx/lpc17_can.c +++ b/arch/arm/src/lpc17xx/lpc17_can.c @@ -1188,7 +1188,7 @@ static int can_bittiming(struct up_dev_s *priv) ((ts2 - 1) << CAN_BTR_TSEG2_SHIFT) | ((sjw - 1) << CAN_BTR_SJW_SHIFT)); -#ifdef CONFIG_CAN_SAM +#ifdef CONFIG_LPC17_CAN_SAM /* The bus is sampled 3 times (recommended for low to medium speed buses * to spikes on the bus-line). */