diff --git a/arch/arm/configs/odroidu_defconfig b/arch/arm/configs/odroidu_defconfig
index 8aab6d012ae7..6615a0f7763d 100644
--- a/arch/arm/configs/odroidu_defconfig
+++ b/arch/arm/configs/odroidu_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.8.13.23 Kernel Configuration
+# Linux/arm 3.8.13.26 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1819,7 +1819,7 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
-CONFIG_SPI_S3C64XX=y
+CONFIG_SPI_S3C64XX=m
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
diff --git a/drivers/hardkernel/Kconfig b/drivers/hardkernel/Kconfig
index e944a1f9edd3..aabe1f2bed3d 100644
--- a/drivers/hardkernel/Kconfig
+++ b/drivers/hardkernel/Kconfig
@@ -18,7 +18,7 @@ config VIDEO_SAMSUNG_S5P_HDMI_CEC
 
 config ODROID_IOBOARD
     tristate "Enable the ODROID-U3+ & I/O Shield2 SPI Test"
-	depends on ODROID_U2
+	depends on (ODROID_U2 && SPI_S3C64XX)
 	default n
 	---help---
 		Enables the I/O Shield2 SPI Drivers
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 6796a252df7a..92de1b50dc50 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1574,11 +1574,19 @@ static struct platform_driver s3c64xx_spi_driver = {
 };
 MODULE_ALIAS("platform:s3c64xx-spi");
 
+#ifdef MODULE
+static int __init s3c64xx_spi_init(void)
+{
+	return platform_driver_probe(&s3c64xx_spi_driver, s3c64xx_spi_probe);
+}
+module_init(s3c64xx_spi_init);
+#else
 static int __init s3c64xx_spi_init(void)
 {
 	return platform_driver_probe(&s3c64xx_spi_driver, s3c64xx_spi_probe);
 }
 subsys_initcall(s3c64xx_spi_init);
+#endif
 
 static void __exit s3c64xx_spi_exit(void)
 {