From: Peter Georg <peter.georg@xxxxxxxxxxxxxxxxxxxxxxxx> e1000: Add ifdef RHEL_DIFFERENCES Bugzilla: https://bugzilla.redhat.com/2019377 Upstream Status: RHEL only Fixes: cf796e6a380ac Signed-off-by: Peter Georg <peter.georg@xxxxxxxxxxxxxxxxxxxxxxxx> diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index blahblah..blahblah 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -933,7 +933,9 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) int bars, need_ioport; bool disable_dev = false; +#ifdef CONFIG_RHEL_DIFFERENCES pci_hw_unmaintained(e1000_pci_tbl, pdev); +#endif /* do not allocate ioport bars when not needed */ need_ioport = e1000_is_need_ioport(pdev); -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
