diff --git a/configs/eagle100/README.txt b/configs/eagle100/README.txt
index 729a60208a..c1b32b950f 100644
--- a/configs/eagle100/README.txt
+++ b/configs/eagle100/README.txt
@@ -200,6 +200,10 @@ Eagle100-specific Configuration Options
 	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
 	CONFIG_UARTn_2STOP - Two stop bits
 
+	CONFIG_SSI0_DISABLE - Select to disable support for SSI0
+	CONFIG_SSI1_DISABLE - Select to disable support for SSI1
+	CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
+
 	CONFIG_LM3S_ETHERNET - This must be set (along with CONFIG_NET)
 	  to build the LM3S Ethernet driver
 	CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 3f507db7e1..23104ef0b9 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -121,12 +121,15 @@ CONFIG_UART0_2STOP=0
 CONFIG_UART1_2STOP=0
 
 #
-# LM3S6918 specific SPI device driver settings
+# LM3S6918 specific SSI device driver settings
 #
-# CONFIG_SPIn_DISABLE - select to disable all support for
-#   the SPI
-CONFIG_SPI1_DISABLE=n
-CONFIG_SPI2_DISABLE=y
+# CONFIG_SSIn_DISABLE - select to disable all support for
+#   the SSI
+# CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support
+#
+CONFIG_SSI0_DISABLE=n
+CONFIG_SSI1_DISABLE=y
+CONFIG_SSI_POLLWAIT=n
 
 #
 # LM3S6918 specific serial device driver settings
@@ -142,7 +145,7 @@ CONFIG_SPI2_DISABLE=y
 # CONFIG_LM3S_MULTICAST - Set to enable multicast frames
 # CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
 # CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
-# 
+#
 CONFIG_LM3S_ETHERNET=y
 CONFIG_LM3S_ETHLEDS=n
 CONFIG_LM3S_BOARDMAC=y
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index d2585df77b..4d63e556ec 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -121,12 +121,15 @@ CONFIG_UART0_2STOP=0
 CONFIG_UART1_2STOP=0
 
 #
-# LM3S6918 specific SPI device driver settings
+# LM3S6918 specific SSI device driver settings
 #
-# CONFIG_SPIn_DISABLE - select to disable all support for
-#   the SPI
-CONFIG_SPI1_DISABLE=n
-CONFIG_SPI2_DISABLE=y
+# CONFIG_SSIn_DISABLE - select to disable all support for
+#   the SSI
+# CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support
+#
+CONFIG_SSI0_DISABLE=n
+CONFIG_SSI1_DISABLE=y
+CONFIG_SSI_POLLWAIT=n
 
 #
 # LM3S6918 specific serial device driver settings
@@ -142,7 +145,7 @@ CONFIG_SPI2_DISABLE=y
 # CONFIG_LM3S_MULTICAST - Set to enable multicast frames
 # CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
 # CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
-# 
+#
 CONFIG_LM3S_ETHERNET=y
 CONFIG_LM3S_ETHLEDS=n
 CONFIG_LM3S_BOARDMAC=y
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 871642923b..dd765ce157 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -121,12 +121,15 @@ CONFIG_UART0_2STOP=0
 CONFIG_UART1_2STOP=0
 
 #
-# LM3S6918 specific SPI device driver settings
+# LM3S6918 specific SSI device driver settings
 #
-# CONFIG_SPIn_DISABLE - select to disable all support for
-#   the SPI
-CONFIG_SPI1_DISABLE=n
-CONFIG_SPI2_DISABLE=y
+# CONFIG_SSIn_DISABLE - select to disable all support for
+#   the SSI
+# CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support
+#
+CONFIG_SSI0_DISABLE=n
+CONFIG_SSI1_DISABLE=y
+CONFIG_SSI_POLLWAIT=n
 
 #
 # LM3S6918 specific serial device driver settings
@@ -142,7 +145,7 @@ CONFIG_SPI2_DISABLE=y
 # CONFIG_LM3S_MULTICAST - Set to enable multicast frames
 # CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
 # CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
-# 
+#
 CONFIG_LM3S_ETHERNET=n
 CONFIG_LM3S_ETHLEDS=n
 CONFIG_LM3S_BOARDMAC=y
diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig
index 9d445f36e8..b10c979e55 100644
--- a/configs/eagle100/ostest/defconfig
+++ b/configs/eagle100/ostest/defconfig
@@ -121,12 +121,15 @@ CONFIG_UART0_2STOP=0
 CONFIG_UART1_2STOP=0
 
 #
-# LM3S6918 specific SPI device driver settings
+# LM3S6918 specific SSI device driver settings
 #
-# CONFIG_SPIn_DISABLE - select to disable all support for
-#   the SPI
-CONFIG_SPI1_DISABLE=n
-CONFIG_SPI2_DISABLE=y
+# CONFIG_SSIn_DISABLE - select to disable all support for
+#   the SSI
+# CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support
+#
+CONFIG_SSI0_DISABLE=n
+CONFIG_SSI1_DISABLE=y
+CONFIG_SSI_POLLWAIT=n
 
 #
 # LM3S6918 specific serial device driver settings
@@ -142,7 +145,7 @@ CONFIG_SPI2_DISABLE=y
 # CONFIG_LM3S_MULTICAST - Set to enable multicast frames
 # CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
 # CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
-# 
+#
 CONFIG_LM3S_ETHERNET=n
 CONFIG_LM3S_ETHLEDS=n
 CONFIG_LM3S_BOARDMAC=y