diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 12:16:44 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 12:16:44 -0400 |
| commit | f53f292eeaa234615c31a1306babe703fc4263f2 (patch) | |
| tree | 707b0933a20f7dc05495e974243a23b5c9f8c918 /arch/arm/mach-at91/Makefile | |
| parent | 15b9c359f288b09003cb70f7ed204affc0c6614d (diff) | |
| parent | a9499fa7cd3fd4824a7202d00c766b269fa3bda6 (diff) | |
Merge remote-tracking branch 'efi/chainsaw' into x86/efi
Resolved Conflicts:
drivers/firmware/efivars.c
fs/efivarsfs/file.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arm/mach-at91/Makefile')
| -rw-r--r-- | arch/arm/mach-at91/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index b38a1dcb79b8..39218ca6d8e8 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
| @@ -66,7 +66,6 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += board-sam9261ek.o | |||
| 66 | # AT91SAM9263 board-specific support | 66 | # AT91SAM9263 board-specific support |
| 67 | obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o | 67 | obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o |
| 68 | obj-$(CONFIG_MACH_USB_A9263) += board-usb-a926x.o | 68 | obj-$(CONFIG_MACH_USB_A9263) += board-usb-a926x.o |
| 69 | obj-$(CONFIG_MACH_NEOCORE926) += board-neocore926.o | ||
| 70 | 69 | ||
| 71 | # AT91SAM9RL board-specific support | 70 | # AT91SAM9RL board-specific support |
| 72 | obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o | 71 | obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o |