diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-04-18 17:15:37 +0300 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-04-18 17:42:23 +0300 |
| commit | 93d5c4ae1b82360f01e2278c83728c1d2be7774e (patch) | |
| tree | ec5369a342569775d66f78e7b7c1bae33667ce96 /sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch | |
| parent | acct-group/gpib: Add gpib group (diff) | |
| download | gentoo-93d5c4ae1b82360f01e2278c83728c1d2be7774e.tar.gz gentoo-93d5c4ae1b82360f01e2278c83728c1d2be7774e.tar.bz2 gentoo-93d5c4ae1b82360f01e2278c83728c1d2be7774e.zip | |
sci-libs/linux-gpib-modules: Version bump
Bug: https://bugs.gentoo.org/704294
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch')
| -rw-r--r-- | sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch new file mode 100644 index 000000000000..e650ccb5ed15 --- /dev/null +++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch @@ -0,0 +1,37 @@ +Index: linux-gpib-kernel/compat/include/linux/device.h +=================================================================== +--- linux-gpib-kernel/compat/include/linux/device.h (revision 1867) ++++ linux-gpib-kernel/compat/include/linux/device.h (revision 1868) +@@ -144,4 +144,10 @@ + + #endif // LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0) ++#define DRIVER_FIND_DEVICE_DATA_TYPE void * ++#else ++#define DRIVER_FIND_DEVICE_DATA_TYPE const void * ++#endif ++ + #endif // __COMPAT_LINUX_DEVICE_H_ +Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c +=================================================================== +--- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1867) ++++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1868) +@@ -982,7 +982,7 @@ + } + + /* Match callback for driver_find_device */ +-static int fmh_gpib_device_match(struct device *dev, void *data) ++static int fmh_gpib_device_match(struct device *dev, DRIVER_FIND_DEVICE_DATA_TYPE data) + { + const gpib_board_config_t *config = data; + +@@ -1014,7 +1014,7 @@ + struct platform_device *pdev; + + board->dev = driver_find_device(&fmh_gpib_platform_driver.driver, +- NULL, (void*)config, &fmh_gpib_device_match); ++ NULL, (DRIVER_FIND_DEVICE_DATA_TYPE)config, &fmh_gpib_device_match); + if(board->dev == NULL) + { + printk("No matching fmh_gpib_core device was found, attach failed."); |