From 471976c7d952433fd65abce6c82f978297a1aa4f Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Wed, 13 Jul 2022 23:37:03 +0800
Subject: [PATCH] igb-intel: mark conflict with kmod-igb (#9750)

Fixes: #9742

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 package/lean/igb-intel/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/lean/igb-intel/Makefile b/package/lean/igb-intel/Makefile
index 8ec8cb372..88537e3e8 100644
--- a/package/lean/igb-intel/Makefile
+++ b/package/lean/igb-intel/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kmod-igb-intel
 PKG_VERSION:=5.10.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=igb-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/e1000/igb%20stable/$(PKG_VERSION)/
@@ -31,7 +31,8 @@ MAKE_OPTS:= \
 define KernelPackage/igb-intel
   SUBMENU:=Network Devices
   TITLE:=Intel igb drivers - oot version from Intel
-  DEPENDS:=+kmod-ptp @PCI_SUPPORT 
+  DEPENDS:=+kmod-ptp @PCI_SUPPORT
+  CONFLICT:=kmod-igb
   KCONFIG:=CONFIG_IGB \
     CONFIG_IGB_HWMON=n \
     CONFIG_IGB_DCA=n