summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c64xx/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-27 04:13:04 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-27 04:13:04 +0400
commit2d86a3f04e345b03d5e429bfe14985ce26bff4dc (patch)
tree10d0d3e57fb65f4df6763e7ef859fdabcf4badd8 /arch/arm/mach-s3c64xx/Makefile
parent3960ef326a1838971466193ffa008ff37c1d978d (diff)
parent5ddac6bc1c4bfcbf645d18668a5033ca257a8ea7 (diff)
downloadlinux-2d86a3f04e345b03d5e429bfe14985ce26bff4dc.tar.xz
Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: ARM: S3C64XX: Configure backup battery charger on Cragganmore ARM: S3C64XX: Fix WM8915 IRQ polarity on Cragganmore ARM: S3C64XX: Configure supplies for all Cragganmore regulators ARM: S3C64XX: Refresh Cragganmore support ARM: S3C64XX: Initial support for Wolfson/Simtec Cragganmore/Banff OMAP4: Keyboard: Mux changes in the board file omap: blaze: add mmc5/wl1283 device support omap: 4430SDP: Register the card detect GPIO properly arm: omap3: cm-t35: add support for cm-t3730 OMAP3: beagle: add support for beagleboard xM revision C OMAP3: rx-51: Add full regulator definitions omap: rx51: Platform support for lp5523 led chip
Diffstat (limited to 'arch/arm/mach-s3c64xx/Makefile')
-rw-r--r--arch/arm/mach-s3c64xx/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile
index f5a7144a052f..61b4034a0c22 100644
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@ -55,6 +55,7 @@ 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
+obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o
# device support