diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 11:58:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 11:58:30 -0800 |
| commit | 08249903ea233a79b4167395f2fb79ccd1fb5f94 (patch) | |
| tree | 13285b46a495b578f721bb83024dae579466e089 /arch/avr32/Makefile | |
| parent | 0d6326a100d7aec588d7c1da9ad77ca7cc7c5b71 (diff) | |
| parent | 183b3af66eb71b5337be10d82dd177a8e3f414e1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Move syscalls.h under arch/avr32/include/asm/
avr32: Define DIE_OOPS
avr32: Remove DMATEST from defconfigs
arch/avr32: Eliminate NULL test and memset after alloc_bootmem
avr32: data param to at32_add_device_mci() must be non-NULL
atmel-mci: move atmel-mci.h file to include/linux
avr32: Hammerhead board support
avr32: Allow reserving multiple pins at once
favr-32: Remove deprecated call
MIMC200: Remove deprecated call
avr: struct device - replace bus_id with dev_name(), dev_set_name()
avr32: Introducing asm/syscalls.h
Diffstat (limited to 'arch/avr32/Makefile')
| -rw-r--r-- | arch/avr32/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile index b088e103e75..f3ef3bbf797 100644 --- a/arch/avr32/Makefile +++ b/arch/avr32/Makefile @@ -33,6 +33,7 @@ head-y += arch/avr32/kernel/head.o core-y += $(machdirs) core-$(CONFIG_BOARD_ATSTK1000) += arch/avr32/boards/atstk1000/ core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/ +core-$(CONFIG_BOARD_HAMMERHEAD) += arch/avr32/boards/hammerhead/ core-$(CONFIG_BOARD_FAVR_32) += arch/avr32/boards/favr-32/ core-$(CONFIG_BOARD_MIMC200) += arch/avr32/boards/mimc200/ core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/ |