From c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Thu, 13 Jun 2013 09:14:40 +0200 Subject: Merged in upstream, took upstream UART driver without changes, needs re-evaluation (minor diffs to local version) --- nuttx/configs/ubw32/src/up_usbterm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nuttx/configs/ubw32/src') diff --git a/nuttx/configs/ubw32/src/up_usbterm.c b/nuttx/configs/ubw32/src/up_usbterm.c index 401d17026..9fe84b548 100644 --- a/nuttx/configs/ubw32/src/up_usbterm.c +++ b/nuttx/configs/ubw32/src/up_usbterm.c @@ -2,7 +2,7 @@ * configs/ubw32/src/up_usbterm.c * arch/arm/src/board/up_usbterm.c * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -80,7 +80,7 @@ int usbterm_devinit(void) * pic32mx_usbattach() will be called in nsh_archinitialize(). */ -#ifndef CONFIG_EXAMPLES_USBTERM_BUILTIN +#ifndef CONFIG_NSH_BUILTIN_APPS pic32mx_usbattach(); #endif return OK; -- cgit v1.2.3