From 8434e05ed01df3f7c584e18712478d35276f7b15 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Sun, 16 Aug 2009 23:54:58 +0100
Subject: [PATCH] --- yaml --- r: 160961 b: refs/heads/master c:
 db616eb67604242c11bfbb331bb143bfe4a2e386 h: refs/heads/master i:   160959:
 c5e90e5b3695bcbaafa67d37cd8171f0658f373c v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/plat-s3c/Kconfig     | 5 +++++
 trunk/arch/arm/plat-s3c/Makefile    | 2 +-
 trunk/arch/arm/plat-s3c24xx/Kconfig | 1 +
 trunk/arch/arm/plat-s3c64xx/Kconfig | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cdc5dba79f08..583be04e309c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e119766f4e15274e2cd9bb5f25119c8b008d920b
+refs/heads/master: db616eb67604242c11bfbb331bb143bfe4a2e386
diff --git a/trunk/arch/arm/plat-s3c/Kconfig b/trunk/arch/arm/plat-s3c/Kconfig
index 935c7558469b..8931c5f0e46b 100644
--- a/trunk/arch/arm/plat-s3c/Kconfig
+++ b/trunk/arch/arm/plat-s3c/Kconfig
@@ -198,4 +198,9 @@ config S3C_DEV_USB_HSOTG
 	help
 	  Compile in platform device definition for USB high-speed OtG
 
+config S3C_DEV_NAND
+	bool
+	help
+	  Compile in platform device definition for NAND controller
+
 endif
diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile
index f32d045e7e36..3c09109e9e84 100644
--- a/trunk/arch/arm/plat-s3c/Makefile
+++ b/trunk/arch/arm/plat-s3c/Makefile
@@ -41,4 +41,4 @@ obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o
 obj-$(CONFIG_S3C_DEV_FB)	+= dev-fb.o
 obj-$(CONFIG_S3C_DEV_USB_HOST)	+= dev-usb.o
 obj-$(CONFIG_S3C_DEV_USB_HSOTG)	+= dev-usb-hsotg.o
-obj-y				+= dev-nand.o
+obj-$(CONFIG_S3C_DEV_NAND)	+= dev-nand.o
diff --git a/trunk/arch/arm/plat-s3c24xx/Kconfig b/trunk/arch/arm/plat-s3c24xx/Kconfig
index 2f9145683596..9c7aca489643 100644
--- a/trunk/arch/arm/plat-s3c24xx/Kconfig
+++ b/trunk/arch/arm/plat-s3c24xx/Kconfig
@@ -10,6 +10,7 @@ config PLAT_S3C24XX
 	default y
 	select NO_IOPORT
 	select ARCH_REQUIRE_GPIOLIB
+	select S3C_DEVICE_NAND
 	help
 	  Base platform code for any Samsung S3C24XX device
 
diff --git a/trunk/arch/arm/plat-s3c64xx/Kconfig b/trunk/arch/arm/plat-s3c64xx/Kconfig
index 5ebd8b425a54..bcfa778614d8 100644
--- a/trunk/arch/arm/plat-s3c64xx/Kconfig
+++ b/trunk/arch/arm/plat-s3c64xx/Kconfig
@@ -19,6 +19,7 @@ config PLAT_S3C64XX
 	select S3C_GPIO_PULL_UPDOWN
 	select S3C_GPIO_CFG_S3C24XX
 	select S3C_GPIO_CFG_S3C64XX
+	select S3C_DEV_NAND
 	select USB_ARCH_HAS_OHCI
 	help
 	  Base platform code for any Samsung S3C64XX device