diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-11 13:52:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-11 13:52:32 -0800 |
commit | 60d7a21aedad7cd2dc9c27ca04fb8486aa6fb7da (patch) | |
tree | 9da308fa03f1e60c10e815fa105415bb3dda427b /arch/nios2/configs/3c120_defconfig | |
parent | d48fcbd864a008802a90c58a9ceddd9436d11a49 (diff) | |
parent | e0691ebb33c12084ef11b6b59228c004e19f59c8 (diff) |
Merge tag 'nios2-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
Pull nios2 update from Ley Foon Tan:
- clean up old Kconfig options from defconfig
- remove leading 0x and 0s from bindings notation in dts files
* tag 'nios2-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
nios2: defconfig: Cleanup from old Kconfig options
nios2: dts: Remove leading 0x and 0s from bindings notation
Diffstat (limited to 'arch/nios2/configs/3c120_defconfig')
-rw-r--r-- | arch/nios2/configs/3c120_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/nios2/configs/3c120_defconfig b/arch/nios2/configs/3c120_defconfig index 9451940678a0..fce33588d55c 100644 --- a/arch/nios2/configs/3c120_defconfig +++ b/arch/nios2/configs/3c120_defconfig @@ -35,7 +35,6 @@ CONFIG_IP_PNP_RARP=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |