diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-13 14:20:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-13 14:21:04 +0100 |
| commit | 56544d29c3a0e383c0d819fefc9570b2803db193 (patch) | |
| tree | 4366fc0ba3f5115b8c1c9d171fa245d86e5415d0 /arch/arm/configs/efm32_defconfig | |
| parent | 9261dc1de11e158a5f6b4b92c8bf1ef4a02dbf0d (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
| download | talos-op-linux-56544d29c3a0e383c0d819fefc9570b2803db193.tar.gz talos-op-linux-56544d29c3a0e383c0d819fefc9570b2803db193.zip | |
Merge tag 'v4.0-rc3' into x86/build, to refresh an older tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/configs/efm32_defconfig')
| -rw-r--r-- | arch/arm/configs/efm32_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig index f59fffb3d0c6..c4c17e3a8e1a 100644 --- a/arch/arm/configs/efm32_defconfig +++ b/arch/arm/configs/efm32_defconfig @@ -17,7 +17,6 @@ CONFIG_EMBEDDED=y # CONFIG_IOSCHED_CFQ is not set # CONFIG_MMU is not set CONFIG_ARCH_EFM32=y -# CONFIG_KUSER_HELPERS is not set CONFIG_SET_MEM_PARAM=y CONFIG_DRAM_BASE=0x88000000 CONFIG_DRAM_SIZE=0x00400000 @@ -49,7 +48,6 @@ CONFIG_MTD=y CONFIG_MTD_BLOCK_RO=y CONFIG_MTD_ROM=y CONFIG_MTD_UCLINUX=y -CONFIG_PROC_DEVICETREE=y # CONFIG_BLK_DEV is not set CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_ARC is not set @@ -78,6 +76,9 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_EFM32_UART=y CONFIG_SERIAL_EFM32_UART_CONSOLE=y # CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_EFM32=y CONFIG_SPI=y CONFIG_SPI_EFM32=y CONFIG_GPIO_SYSFS=y |
