diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-08-10 09:05:53 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-08-10 09:05:53 -0700 |
| commit | c002c27874faaa170b535d03d7efee89ecdd9be4 (patch) | |
| tree | 70d91eba77a9c374e4f0bf9eb8636acba57ca173 /arch/arm/configs/nhk8815_defconfig | |
| parent | 866b5e447f1ad3a0d72c139fabe3dd71f351f361 (diff) | |
| parent | 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff) | |
Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulator
Linux v4.13-rc1
Diffstat (limited to 'arch/arm/configs/nhk8815_defconfig')
| -rw-r--r-- | arch/arm/configs/nhk8815_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index 7d2ad30d9e70..0ac44acd5bc4 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig @@ -32,7 +32,6 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_NET_IPIP=y CONFIG_IP_MROUTE=y -# CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set CONFIG_BT=m CONFIG_BT_RFCOMM=m |