Merge pull request #509 from micmac1/dahdi-linux-5.4

dahdi-linux: bump to version 3.1.0
This commit is contained in:
Daniel Golle 2020-03-19 18:25:25 +00:00 committed by GitHub
commit e684654b38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions

View file

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=dahdi-linux
PKG_VERSION:=3.0.0
PKG_VERSION:=3.1.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases
PKG_HASH:=02a8a680d20a3e243f37259edc3554ab9a488595a28562c45c33da3792d12caa
PKG_HASH:=db5b758437d066a7edad34b54313f08a4ccdde28373492986b72c798e8561b4d
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE

View file

@ -1716,7 +1716,7 @@
+ hfc_proc_dahdi_hfcs_dir = proc_mkdir(hfc_DRIVER_NAME, proc_root_driver);
+#endif
+
+ ret = dahdi_pci_module(&hfc_driver);
+ ret = pci_register_driver(&hfc_driver);
+ return ret;
+}
+

View file

@ -0,0 +1,13 @@
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -59,8 +59,10 @@
#include <linux/poll.h>
#ifdef CONFIG_PCI
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
#include <linux/pci-aspm.h>
#endif
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
#define HAVE_NET_DEVICE_OPS