diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-10 00:41:46 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-10 00:41:46 (GMT) |
| commit | 2aecd7dd2b269989aca99a4f2717504a89a2565c (patch) | |
| tree | 8efea817538ff4aa98d6e47e2840b183421d43dd /arch/arm/configs | |
| parent | 94c16ea6ea75f8f5de92d10a647155ccf0d05436 (diff) | |
| parent | b65adbec2d92769242e0ffe742630d88e68f7f22 (diff) | |
| download | linux-fsl-qoriq-2aecd7dd2b269989aca99a4f2717504a89a2565c.tar.xz | |
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
From Nicolas Ferre:
Little AT91 cleanup: only remove one deprecated board.
* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
ARM: at91: remove NEOCORE 926 board
Signed-off-by: Olof Johansson <olof@lixom.net>
Modify/remove conflict in arch/arm/mach-at91/board-neocore926.c
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/at91sam9263_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig index c5212f4..36fed66b 100644 --- a/arch/arm/configs/at91sam9263_defconfig +++ b/arch/arm/configs/at91sam9263_defconfig @@ -18,7 +18,6 @@ CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91SAM9263=y CONFIG_MACH_AT91SAM9263EK=y CONFIG_MACH_USB_A9263=y -CONFIG_MACH_NEOCORE926=y CONFIG_MTD_AT91_DATAFLASH_CARD=y # CONFIG_ARM_THUMB is not set CONFIG_AEABI=y |