diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-22 13:10:28 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-22 13:10:28 -0400 |
| commit | b52d2320276cfeb8e8eccdc1b87a3c078da255cf (patch) | |
| tree | 817fc5300de9f0c83ed38f627b08d4a06d7939c6 | |
| parent | c2c73aa8593b9996b9b6f85daf21956c7d655fb6 (diff) | |
| parent | b97cecc7a61df121f2c1e350e09fc784a1706ef0 (diff) | |
Merge tag 'socfpga_defconfig_for_v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/defconfig
SoCFPGA defconfig update for v4.4
- Add the FPGA manager config option
* tag 'socfpga_defconfig_for_v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga_defconfig: enable fpga manager
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/socfpga_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index a2956c3112f1..8128b93ed72c 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig | |||
| @@ -86,6 +86,8 @@ CONFIG_USB_DWC2=y | |||
| 86 | CONFIG_USB_DWC2_HOST=y | 86 | CONFIG_USB_DWC2_HOST=y |
| 87 | CONFIG_MMC=y | 87 | CONFIG_MMC=y |
| 88 | CONFIG_MMC_DW=y | 88 | CONFIG_MMC_DW=y |
| 89 | CONFIG_FPGA=y | ||
| 90 | CONFIG_FPGA_MGR_SOCFPGA=y | ||
| 89 | CONFIG_EXT2_FS=y | 91 | CONFIG_EXT2_FS=y |
| 90 | CONFIG_EXT2_FS_XATTR=y | 92 | CONFIG_EXT2_FS_XATTR=y |
| 91 | CONFIG_EXT2_FS_POSIX_ACL=y | 93 | CONFIG_EXT2_FS_POSIX_ACL=y |