diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /arch/arm/mach-s3c2410/Makefile | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'arch/arm/mach-s3c2410/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c2410/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile index cabc13ce09e4..00f31f8c4e78 100644 --- a/arch/arm/mach-s3c2410/Makefile +++ b/arch/arm/mach-s3c2410/Makefile | |||
| @@ -30,3 +30,11 @@ obj-$(CONFIG_BAST_PC104_IRQ) += bast-irq.o | |||
| 30 | obj-$(CONFIG_MACH_TCT_HAMMER) += mach-tct_hammer.o | 30 | obj-$(CONFIG_MACH_TCT_HAMMER) += mach-tct_hammer.o |
| 31 | obj-$(CONFIG_MACH_VR1000) += mach-vr1000.o usb-simtec.o | 31 | obj-$(CONFIG_MACH_VR1000) += mach-vr1000.o usb-simtec.o |
| 32 | obj-$(CONFIG_MACH_QT2410) += mach-qt2410.o | 32 | obj-$(CONFIG_MACH_QT2410) += mach-qt2410.o |
| 33 | |||
| 34 | # Common bits of machine support | ||
| 35 | |||
| 36 | obj-$(CONFIG_SIMTEC_NOR) += nor-simtec.o | ||
| 37 | |||
| 38 | # machine additions | ||
| 39 | |||
| 40 | obj-$(CONFIG_MACH_BAST_IDE) += bast-ide.o | ||