4 files changed, 12 insertions, 12 deletions
diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c
index 6165cd9e9..644ac4d17 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c
+++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c
@@ -143,7 +143,7 @@ int nsh_archinitialize(void)
 
   /* Get the SSP port */
 
-  ssp = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  ssp = lpc17_sspinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!ssp)
     {
       message("nsh_archinitialize: Failed to initialize SSP port %d\n",
diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c
index c22b09ceb..709eadcab 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c
+++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c
@@ -123,25 +123,25 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno)
 
   oleddc_dumpgpio("up_nxdrvinit: After OLED Power/DC setup");
 
-  /* Get the SSI port (configure as a Freescale SPI port) */
+  /* Get the SPI1 port (configure as a Freescale SPI port) */
 
-  spi = up_spiinitialize(1);
+  spi = lpc17_sspinitialize(1);
   if (!spi)
     {
-      glldbg("Failed to initialize SSI port 1\n");
+      glldbg("Failed to initialize SPI port 1\n");
     }
   else
     {
-      /* Bind the SSI port to the OLED */
+      /* Bind the SPI port to the OLED */
 
       dev = ug_initialize(spi, devno);
       if (!dev)
         {
-          glldbg("Failed to bind SSI port 1 to OLED %d: %d\n", devno);
+          glldbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
-          gllvdbg("Bound SSI port 1 to OLED %d\n", devno);
+          gllvdbg("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on (dim) */
 
diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c
index 3504d78c7..ff5908753 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c
+++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c
@@ -134,7 +134,7 @@ void weak_function lpc17_sspinitialize(void)
  *   The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status 
  *   must be provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi.h). All other methods (including lpc17_sspinitialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -143,9 +143,9 @@ void weak_function lpc17_sspinitialize(void)
  *   2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions
  *      in your board-specific logic.  These functions will perform chip selection
  *      and status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to up_spiinitialize() in your low level application
+ *   3. Add a calls to lpc17_sspinitialize() in your low level application
  *      initialization logic
- *   4. The handle returned by up_spiinitialize() may then be used to bind the
+ *   4. The handle returned by lpc17_sspinitialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling 
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).
diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
index 937c7857a..542a49a20 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
+++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/lpcxpresso-lpc1768/src/up_usbmsc.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the LPC17xx MMC/SD SPI block driver.
@@ -113,7 +113,7 @@ int usbmsc_archinitialize(void)
   message("usbmsc_archinitialize: Initializing SPI port %d\n",
           LPC17XX_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(LPC17XX_MMCSDSPIPORTNO);
+  spi = lpc17_sspinitialize(LPC17XX_MMCSDSPIPORTNO);
   if (!spi)
     {
       message("usbmsc_archinitialize: Failed to initialize SPI port %d\n",