diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 10:11:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 10:11:26 -0700 |
| commit | 8f041e6ca1901d7dbf017e6db67c264117211b8a (patch) | |
| tree | eeae46a7ba63e656a802ece06501a623bec7f914 /arch/arc/configs/fpga_defconfig | |
| parent | b247759642cc96a75122907cc898b4c43b4f86ce (diff) | |
| parent | 723e2b801d803035ec7a7c0fe162a6c9fc118164 (diff) | |
Merge tag 'arc-v3.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull second set of ARC architecture updates from Vineet Gupta:
"Couple of Platform updates (Device Tree files primarily) given that
the corresponding drivers (net/ethernet/arc/*, irqctl/irq-tb10x.c)
have now been merged into your tree.
Ideally these shd have been part of same submissions, oh well..."
* tag 'arc-v3.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [TB10x] Updates for irqchip driver
ARC: [plat-arcfpga] Enable arc_emac for ARCAngle4 Board
Diffstat (limited to 'arch/arc/configs/fpga_defconfig')
| -rw-r--r-- | arch/arc/configs/fpga_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arc/configs/fpga_defconfig b/arch/arc/configs/fpga_defconfig index c109af32027..4ca50f1f8d0 100644 --- a/arch/arc/configs/fpga_defconfig +++ b/arch/arc/configs/fpga_defconfig @@ -38,6 +38,9 @@ CONFIG_INET=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_BLK_DEV is not set +CONFIG_NETDEVICES=y +CONFIG_ARC_EMAC=y +CONFIG_LXT_PHY=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set |