diff options
| author | Florian Franzmann | 2022-05-23 20:14:07 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2022-05-23 20:14:07 +0200 |
| commit | 17c42ebac4f722107a40a3db82cd6ada963a7154 (patch) | |
| tree | 71db9553a89f7e3b838352e697de85eee8fdd5fb | |
| parent | e66148091ea5b13571c24c70f8c6bbaf7749ee33 (diff) | |
Revert "z-kernels/nvidia_driver: add conflict with nvidia-open-gpu-kernel-modules"
This reverts commit 931571804ec6800a3b84c01a7f294ca0f8003986.
nvidia-open-gpu-kernel-modules optionally depends on this spell.
| -rwxr-xr-x | z-kernels/nvidia_driver/CONFLICTS | 7 | ||||
| -rw-r--r-- | z-kernels/nvidia_driver/HISTORY | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/z-kernels/nvidia_driver/CONFLICTS b/z-kernels/nvidia_driver/CONFLICTS index 99df1c66..8b0c723e 100755 --- a/z-kernels/nvidia_driver/CONFLICTS +++ b/z-kernels/nvidia_driver/CONFLICTS @@ -1,7 +1,6 @@ -conflicts nvidia_legacy && -conflicts nvidia_legacy_96xx && +conflicts nvidia_legacy && +conflicts nvidia_legacy_96xx && conflicts nvidia_legacy_173xx && conflicts nvidia_legacy_295xx && conflicts nvidia_legacy_304xx && -conflicts nvidia_legacy_340xx && -conflicts nvidia-open-gpu-kernel-modules +conflicts nvidia_legacy_340xx diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY index aa658f4f..abe65589 100644 --- a/z-kernels/nvidia_driver/HISTORY +++ b/z-kernels/nvidia_driver/HISTORY @@ -1,5 +1,4 @@ 2022-05-20 Florian Franzmann <bwlf@bandrate.org> - * CONFLICTS: add conflict with nvidia-open-gpu-kernel-modules * DETAILS: stable version 510.73.05 2022-04-25 Florian Franzmann <bwlf@bandrate.org> |