From b778d94e63859eae5eab3f8e5d7c1b3d7124c315 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 26 May 2014 12:50:48 +0200 Subject: [PATCH] linux: update to linux-3.15-rc7 Signed-off-by: Stephan Raue --- packages/linux/package.mk | 2 +- .../{3.15-rc6 => 3.15-rc7}/linux-003-no_dev_console.patch | 0 .../linux-052-XBOX_remote_support.patch | 0 .../linux-053-spinelplus-remote-0.2.patch | 0 ..._revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch | 0 .../linux-055-add_Formosa_eHome_Infrared_Receiver.patch | 0 .../linux-056-add_Adaptec_eHome_Infrared_Receiver.patch | 0 ...Removed-MCE-customer-code-restriction-in-rc6-decode.patch | 0 ...nux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch | 0 ...inux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch | 0 .../linux-058.06-hid_sony-add_SMK_link.patch | 0 .../linux-059-remove_some_xpad_pids-0.2.patch | 0 .../linux-060-add_AUGUST_DVB-T205.patch | 0 .../linux-203-stb0899_enable_low_symbol_rate.patch | 0 .../patches/{3.15-rc6 => 3.15-rc7}/linux-210-dvbsky.patch | 0 .../linux-212-mantis_stb0899_faster_lock.patch | 0 .../{3.15-rc6 => 3.15-rc7}/linux-221-ngene-octopus.patch | 0 .../linux-222-stb0899_signal_quality.patch | 0 .../linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch | 0 .../linux-701-linksys_aes2500_brcmfmac.patch | 0 .../linux-703-macmini2012-ethernet.patch | 0 .../linux-704-Support-for-Ubiquiti-WifiStation.patch | 0 .../linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch | 0 .../{3.15-rc6 => 3.15-rc7}/linux-706-Sitecom-N300.patch | 0 .../{3.15-rc6 => 3.15-rc7}/linux-900-hide_tsc_error.patch | 0 .../linux-950-saa716x_PCIe_interface_chipset.patch | 0 ....06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch | 0 .../{3.15-rc6 => 3.15-rc7}/linux-991.01-ptrace_fix.patch | 0 .../linux-995-CX24120-13Z_frontend.patch | 0 ....02-0001-pm-disable-async-suspend-resume-by-default.patch | 0 .../linux-999.03-0001-fix-mceusb.patch | 0 .../linux-999.04-revert-xhci-Set-scatter-gather-limit.patch | 0 projects/ATV/linux/linux.i386.conf | 5 +++-- projects/Generic/linux/linux.i386.conf | 5 +++-- projects/Generic/linux/linux.x86_64.conf | 5 +++-- 35 files changed, 10 insertions(+), 7 deletions(-) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-003-no_dev_console.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-052-XBOX_remote_support.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-053-spinelplus-remote-0.2.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-055-add_Formosa_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-058.06-hid_sony-add_SMK_link.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-059-remove_some_xpad_pids-0.2.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-060-add_AUGUST_DVB-T205.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-203-stb0899_enable_low_symbol_rate.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-210-dvbsky.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-212-mantis_stb0899_faster_lock.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-221-ngene-octopus.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-222-stb0899_signal_quality.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-701-linksys_aes2500_brcmfmac.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-703-macmini2012-ethernet.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-704-Support-for-Ubiquiti-WifiStation.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-706-Sitecom-N300.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-900-hide_tsc_error.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-950-saa716x_PCIe_interface_chipset.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-991.01-ptrace_fix.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-995-CX24120-13Z_frontend.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-999.03-0001-fix-mceusb.patch (100%) rename packages/linux/patches/{3.15-rc6 => 3.15-rc7}/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch (100%) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index d39599d6e4..7dd7b4f6e3 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -27,7 +27,7 @@ case "$LINUX" in PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" ;; *) - PKG_VERSION="3.15-rc6" + PKG_VERSION="3.15-rc7" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/testing/$PKG_NAME-$PKG_VERSION.tar.xz" ;; esac diff --git a/packages/linux/patches/3.15-rc6/linux-003-no_dev_console.patch b/packages/linux/patches/3.15-rc7/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-003-no_dev_console.patch rename to packages/linux/patches/3.15-rc7/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/3.15-rc6/linux-052-XBOX_remote_support.patch b/packages/linux/patches/3.15-rc7/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/3.15-rc7/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/3.15-rc6/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/3.15-rc7/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/3.15-rc7/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/3.15-rc6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/3.15-rc7/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/3.15-rc7/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/3.15-rc6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.15-rc7/linux-055-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.15-rc7/linux-055-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.15-rc6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.15-rc7/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.15-rc7/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.15-rc6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/3.15-rc7/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/3.15-rc7/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/3.15-rc6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/3.15-rc7/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/3.15-rc7/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.15-rc6/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/3.15-rc7/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/3.15-rc7/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/3.15-rc6/linux-058.06-hid_sony-add_SMK_link.patch b/packages/linux/patches/3.15-rc7/linux-058.06-hid_sony-add_SMK_link.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-058.06-hid_sony-add_SMK_link.patch rename to packages/linux/patches/3.15-rc7/linux-058.06-hid_sony-add_SMK_link.patch diff --git a/packages/linux/patches/3.15-rc6/linux-059-remove_some_xpad_pids-0.2.patch b/packages/linux/patches/3.15-rc7/linux-059-remove_some_xpad_pids-0.2.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-059-remove_some_xpad_pids-0.2.patch rename to packages/linux/patches/3.15-rc7/linux-059-remove_some_xpad_pids-0.2.patch diff --git a/packages/linux/patches/3.15-rc6/linux-060-add_AUGUST_DVB-T205.patch b/packages/linux/patches/3.15-rc7/linux-060-add_AUGUST_DVB-T205.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-060-add_AUGUST_DVB-T205.patch rename to packages/linux/patches/3.15-rc7/linux-060-add_AUGUST_DVB-T205.patch diff --git a/packages/linux/patches/3.15-rc6/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.15-rc7/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.15-rc7/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.15-rc6/linux-210-dvbsky.patch b/packages/linux/patches/3.15-rc7/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-210-dvbsky.patch rename to packages/linux/patches/3.15-rc7/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.15-rc6/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.15-rc7/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.15-rc7/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.15-rc6/linux-221-ngene-octopus.patch b/packages/linux/patches/3.15-rc7/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.15-rc7/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.15-rc6/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.15-rc7/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.15-rc7/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.15-rc6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/3.15-rc7/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/3.15-rc7/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/3.15-rc6/linux-701-linksys_aes2500_brcmfmac.patch b/packages/linux/patches/3.15-rc7/linux-701-linksys_aes2500_brcmfmac.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-701-linksys_aes2500_brcmfmac.patch rename to packages/linux/patches/3.15-rc7/linux-701-linksys_aes2500_brcmfmac.patch diff --git a/packages/linux/patches/3.15-rc6/linux-703-macmini2012-ethernet.patch b/packages/linux/patches/3.15-rc7/linux-703-macmini2012-ethernet.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-703-macmini2012-ethernet.patch rename to packages/linux/patches/3.15-rc7/linux-703-macmini2012-ethernet.patch diff --git a/packages/linux/patches/3.15-rc6/linux-704-Support-for-Ubiquiti-WifiStation.patch b/packages/linux/patches/3.15-rc7/linux-704-Support-for-Ubiquiti-WifiStation.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-704-Support-for-Ubiquiti-WifiStation.patch rename to packages/linux/patches/3.15-rc7/linux-704-Support-for-Ubiquiti-WifiStation.patch diff --git a/packages/linux/patches/3.15-rc6/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch b/packages/linux/patches/3.15-rc7/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch rename to packages/linux/patches/3.15-rc7/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch diff --git a/packages/linux/patches/3.15-rc6/linux-706-Sitecom-N300.patch b/packages/linux/patches/3.15-rc7/linux-706-Sitecom-N300.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-706-Sitecom-N300.patch rename to packages/linux/patches/3.15-rc7/linux-706-Sitecom-N300.patch diff --git a/packages/linux/patches/3.15-rc6/linux-900-hide_tsc_error.patch b/packages/linux/patches/3.15-rc7/linux-900-hide_tsc_error.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-900-hide_tsc_error.patch rename to packages/linux/patches/3.15-rc7/linux-900-hide_tsc_error.patch diff --git a/packages/linux/patches/3.15-rc6/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.15-rc7/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.15-rc7/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.15-rc6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/3.15-rc7/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/3.15-rc7/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/3.15-rc6/linux-991.01-ptrace_fix.patch b/packages/linux/patches/3.15-rc7/linux-991.01-ptrace_fix.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-991.01-ptrace_fix.patch rename to packages/linux/patches/3.15-rc7/linux-991.01-ptrace_fix.patch diff --git a/packages/linux/patches/3.15-rc6/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/3.15-rc7/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/3.15-rc7/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/3.15-rc6/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch b/packages/linux/patches/3.15-rc7/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch rename to packages/linux/patches/3.15-rc7/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch diff --git a/packages/linux/patches/3.15-rc6/linux-999.03-0001-fix-mceusb.patch b/packages/linux/patches/3.15-rc7/linux-999.03-0001-fix-mceusb.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-999.03-0001-fix-mceusb.patch rename to packages/linux/patches/3.15-rc7/linux-999.03-0001-fix-mceusb.patch diff --git a/packages/linux/patches/3.15-rc6/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch b/packages/linux/patches/3.15-rc7/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch similarity index 100% rename from packages/linux/patches/3.15-rc6/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch rename to packages/linux/patches/3.15-rc7/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 02f3f45f1e..3abbd34666 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.15.0-rc6 Kernel Configuration +# Linux/i386 3.15.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -853,7 +853,7 @@ CONFIG_LLC=m CONFIG_6LOWPAN_IPHC=m # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set -CONFIG_DNS_RESOLVER=m +CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set # CONFIG_VSOCKETS is not set @@ -1305,6 +1305,7 @@ CONFIG_NET_VENDOR_ARC=y # CONFIG_NET_CALXEDA_XGMAC is not set # CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_NET_VENDOR_CISCO is not set +# CONFIG_CX_ECAT is not set # CONFIG_DNET is not set # CONFIG_NET_VENDOR_DEC is not set # CONFIG_NET_VENDOR_DLINK is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index cb2d29f905..15f1822728 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.15.0-rc6 Kernel Configuration +# Linux/i386 3.15.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -881,7 +881,7 @@ CONFIG_LLC=m CONFIG_6LOWPAN_IPHC=m # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set -CONFIG_DNS_RESOLVER=m +CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set # CONFIG_VSOCKETS is not set @@ -1366,6 +1366,7 @@ CONFIG_TIGON3=y # CONFIG_NET_CALXEDA_XGMAC is not set # CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_NET_VENDOR_CISCO is not set +# CONFIG_CX_ECAT is not set # CONFIG_DNET is not set CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 6163cf54b5..e277a87afe 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.15.0-rc6 Kernel Configuration +# Linux/x86_64 3.15.0-rc7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -868,7 +868,7 @@ CONFIG_LLC=m CONFIG_6LOWPAN_IPHC=m # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set -CONFIG_DNS_RESOLVER=m +CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set # CONFIG_VSOCKETS is not set @@ -1353,6 +1353,7 @@ CONFIG_TIGON3=y # CONFIG_NET_CALXEDA_XGMAC is not set # CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_NET_VENDOR_CISCO is not set +# CONFIG_CX_ECAT is not set # CONFIG_DNET is not set CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y