From a8416d2a26571fa8e6d9678ba0d42e3c499c0d11 Mon Sep 17 00:00:00 2001 From: Lok Tep Date: Mon, 9 Nov 2015 14:41:08 +0100 Subject: [PATCH] revert --- arch/arm/include/lpc43xx/chip.h | 5 ++--- arch/arm/src/lpc43xx/lpc43_usb0dev.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/lpc43xx/chip.h b/arch/arm/include/lpc43xx/chip.h index abb3ee64834..d0409ef0bb5 100644 --- a/arch/arm/include/lpc43xx/chip.h +++ b/arch/arm/include/lpc43xx/chip.h @@ -46,7 +46,7 @@ * Pre-processor Definitions ************************************************************************************/ -/* Per the data sheet: LPC4350/30/20/10 Rev. 3.2 4 June 2012 */ +/* Per the data sheet: LPC4350/30/20/10 Rev. 3.2 4 June 2012 */ /* Get customizations for each supported chip. * * SRAM Resources @@ -74,7 +74,7 @@ * manager. This gives some symmetry to all of the members of the family. */ -/* Per the user manual: UM10503, Rev. 1.2 � 8 June 2012 */ +/* Per the user manual: UM10503, Rev. 1.2 — 8 June 2012 */ /* Get customizations for each supported chip. * * SRAM Resources @@ -632,7 +632,6 @@ # define LPC43_NDAC (1) /* One 10-bit DAC */ # define LPC43_NADC10_CHANNELS (8) /* Eight ADC channels (per ADC)*/ # define LPC43_NADC12 (1) /* ONne 12-bit ADC controllers (ADCHS)*/ ->>>>>>> remotes/nuttx/arch/master #else # error "Unsupported LPC43xx chip" #endif diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c index d7545c82e92..8d8237bcf9b 100644 --- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c +++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c @@ -2847,4 +2847,4 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) g_usbdev.driver = NULL; return OK; } ->>>>>>> remotes/nuttx/arch/master +