diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 12:38:30 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 12:38:30 +0200 |
| commit | 84eb9ecce20acfd287ba0d623fe5e99bfab08686 (patch) | |
| tree | ed60f11843face3b8b2016d9adea36a8d709bb6b /arch/arm/mach-s5pc100/Makefile | |
| parent | ARM: Merge for-2635-4/s5pv210-boards (diff) | |
| parent | ARM: SMDKC100: Add audio devices on board (diff) | |
| download | linux-84eb9ecce20acfd287ba0d623fe5e99bfab08686.tar.xz linux-84eb9ecce20acfd287ba0d623fe5e99bfab08686.zip | |
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/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile index 6e3f57c39c97..26f6f30cc7e2 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 |