diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-08-16 23:54:58 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-16 23:54:58 +0100 |
commit | db616eb67604242c11bfbb331bb143bfe4a2e386 (patch) | |
tree | f6ac29fddb1870e16c9cd42a0c35a9336886ad38 /arch/arm/plat-s3c | |
parent | e119766f4e15274e2cd9bb5f25119c8b008d920b (diff) | |
download | linux-3.10-db616eb67604242c11bfbb331bb143bfe4a2e386.tar.gz linux-3.10-db616eb67604242c11bfbb331bb143bfe4a2e386.tar.bz2 linux-3.10-db616eb67604242c11bfbb331bb143bfe4a2e386.zip |
ARM: S3C: Add S3C_DEV_NAND Kconfig entry
Currently the S5PC100 does not define S3C_PA_NAND, leaving the NAND device
definitions in arch/arm/plat-s3c/dev-nand.c unbuildable. Add a KConfig
entry to select whether this is built.
As backwards compatibility, both the S3C24XX and S3C64XX define the new
configuration in their main Kconfig files until better support for basing
this selection on a per-machine basis can be sorted out.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c')
-rw-r--r-- | arch/arm/plat-s3c/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/plat-s3c/Makefile | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig index 935c7558469..8931c5f0e46 100644 --- a/arch/arm/plat-s3c/Kconfig +++ b/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/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index f32d045e7e3..3c09109e9e8 100644 --- a/arch/arm/plat-s3c/Makefile +++ b/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 |