summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pc100/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-20 19:38:30 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-20 19:38:30 +0900
commit84eb9ecce20acfd287ba0d623fe5e99bfab08686 (patch)
treeed60f11843face3b8b2016d9adea36a8d709bb6b /arch/arm/mach-s5pc100/Makefile
parentea5a4e209ddca984bbb5803b30d5e013e631f9ac (diff)
parent99c56e0ce1c11221948c7da127b0bbe1641cbe41 (diff)
downloadop-kernel-dev-84eb9ecce20acfd287ba0d623fe5e99bfab08686.zip
op-kernel-dev-84eb9ecce20acfd287ba0d623fe5e99bfab08686.tar.gz
ARM: Merge for-2635-4/s5p-devs
Merge branch 'for-2635-4/s5p-devs' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/include/mach/map.h
Diffstat (limited to 'arch/arm/mach-s5pc100/Makefile')
-rw-r--r--arch/arm/mach-s5pc100/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile
index 6e3f57c..26f6f30 100644
--- a/arch/arm/mach-s5pc100/Makefile
+++ b/arch/arm/mach-s5pc100/Makefile
@@ -24,3 +24,6 @@ obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
# machine support
obj-$(CONFIG_MACH_SMDKC100) += mach-smdkc100.o
+
+# device support
+obj-y += dev-audio.o
OpenPOWER on IntegriCloud