Merge tag 'mvebu-defconfig-3.14' of git://git.infradead.org/linux-mvebu into next/boards

From Jason Cooper:
mvebu defconfig changes for v3.14

 - mvebu: add GPIO LEDs
 - kirkwood: enable HIGHMEM

* tag 'mvebu-defconfig-3.14' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: enable HIGHMEM in defconfig
  ARM: mvebu: config: Add GPIO connected LEDs support to defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/configs/kirkwood_defconfig

@@ -27,6 +27,7 @@ CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
+CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CPU_FREQ=y

arch/arm/configs/mvebu_defconfig

@@ -69,6 +69,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_MMC=y
 CONFIG_MMC_MVSDIO=y
 CONFIG_NEW_LEDS=y
+CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y