diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:52 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:52 +0100 |
commit | 119c4b1257e44d9ec981465ccb80aba427a96dda (patch) | |
tree | 059647211002acf6bd0a6137b310d212b5653f7a /arch/arm/mach-s3c64xx/Makefile | |
parent | 3d34a0d80ab51b6838c08c22e7f47aec408eb837 (diff) | |
parent | d472d1a1c82ade81d2854db2ff4c9694ed66612e (diff) | |
download | kernel_goldelico_gta04-119c4b1257e44d9ec981465ccb80aba427a96dda.zip kernel_goldelico_gta04-119c4b1257e44d9ec981465ccb80aba427a96dda.tar.gz kernel_goldelico_gta04-119c4b1257e44d9ec981465ccb80aba427a96dda.tar.bz2 |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-s3c64xx/Makefile')
-rw-r--r-- | arch/arm/mach-s3c64xx/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index a10f1fc..9d10069 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile @@ -52,6 +52,9 @@ obj-$(CONFIG_MACH_SMDK6400) += mach-smdk6400.o obj-$(CONFIG_MACH_SMDK6410) += mach-smdk6410.o obj-$(CONFIG_MACH_NCP) += mach-ncp.o obj-$(CONFIG_MACH_HMT) += mach-hmt.o +obj-$(CONFIG_MACH_SMARTQ) += mach-smartq.o +obj-$(CONFIG_MACH_SMARTQ5) += mach-smartq5.o +obj-$(CONFIG_MACH_SMARTQ7) += mach-smartq7.o # device support @@ -59,3 +62,4 @@ obj-y += dev-uart.o obj-y += dev-audio.o obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o obj-$(CONFIG_S3C64XX_DEV_TS) += dev-ts.o +obj-$(CONFIG_S3C64XX_DEV_ONENAND1) += dev-onenand1.o |