From e4d7d1c24ada2d57d753161345eea0afea4f9b1e Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 20 Mar 2025 13:53:53 +0800 Subject: [PATCH] kernel: netdevices: fix merge conflict Fixes: f41698d515bd ("Merge Official Source") Signed-off-by: Tianling Shen --- package/kernel/linux/modules/netdevices.mk | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index cddfef25d7..a55431997d 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1205,7 +1205,7 @@ define KernelPackage/ice TITLE:=Intel(R) Ethernet Controller E810 Series support DEPENDS:=@PCI_SUPPORT +kmod-ptp KCONFIG:=CONFIG_ICE \ - CONFIG_ICE_HWTS=n \ + CONFIG_ICE_HWTS=y \ CONFIG_ICE_SWITCHDEV=y FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/ice/ice.ko AUTOLOAD:=$(call AutoProbe,ice) @@ -1240,25 +1240,6 @@ endef $(eval $(call KernelPackage,iavf)) -define KernelPackage/ice - SUBMENU:=$(NETWORK_DEVICES_MENU) - TITLE:=Intel(R) Ethernet Controller E810 Series support - DEPENDS:=@PCI_SUPPORT +kmod-ptp @!TARGET_apm821xx - KCONFIG:=\ - CONFIG_ICE \ - CONFIG_ICE_HWTS=y \ - CONFIG_ICE_SWITCHDEV=y - FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/ice/ice.ko - AUTOLOAD:=$(call AutoProbe,ice) -endef - -define KernelPackage/ice/description - Kernel modules for Intel(R) Ethernet Controller E810 Series -endef - -$(eval $(call KernelPackage,ice)) - - define KernelPackage/b44 TITLE:=Broadcom 44xx driver KCONFIG:=CONFIG_B44