diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-gemini/Makefile | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-gemini/Makefile')
| -rw-r--r-- | arch/arm/mach-gemini/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-gemini/Makefile b/arch/arm/mach-gemini/Makefile index 719505b8182..c5b24b95a76 100644 --- a/arch/arm/mach-gemini/Makefile +++ b/arch/arm/mach-gemini/Makefile | |||
| @@ -7,4 +7,7 @@ | |||
| 7 | obj-y := irq.o mm.o time.o devices.o gpio.o | 7 | obj-y := irq.o mm.o time.o devices.o gpio.o |
| 8 | 8 | ||
| 9 | # Board-specific support | 9 | # Board-specific support |
| 10 | obj-$(CONFIG_MACH_NAS4220B) += board-nas4220b.o | ||
| 10 | obj-$(CONFIG_MACH_RUT100) += board-rut1xx.o | 11 | obj-$(CONFIG_MACH_RUT100) += board-rut1xx.o |
| 12 | obj-$(CONFIG_MACH_WBD111) += board-wbd111.o | ||
| 13 | obj-$(CONFIG_MACH_WBD222) += board-wbd222.o | ||