diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-26 11:50:50 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-26 11:50:50 +0200 |
| commit | 4ea9e1d2796d9e3d8b0987ea6717340599717871 (patch) | |
| tree | e7ad06e2d37706d8062e6b2f15cd73455830409c /patch-5.12-redhat.patch | |
| parent | 994859d1fcb50c34d178d7235655e391442f0baa (diff) | |
| parent | bcfd460728890f1cf88ea2ef5b3eb153db47378f (diff) | |
| download | kernel-4ea9e1d2796d9e3d8b0987ea6717340599717871.tar.gz kernel-4ea9e1d2796d9e3d8b0987ea6717340599717871.tar.xz kernel-4ea9e1d2796d9e3d8b0987ea6717340599717871.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.12-redhat.patch')
| -rw-r--r-- | patch-5.12-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.12-redhat.patch b/patch-5.12-redhat.patch index 5f42bae10..c8ad8abe9 100644 --- a/patch-5.12-redhat.patch +++ b/patch-5.12-redhat.patch @@ -66,7 +66,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index f60212a0412c..7424a878605f 100644 +index dd021135838b..834afa29b14c 100644 --- a/Makefile +++ b/Makefile @@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -1027,7 +1027,7 @@ index a751553fa0db..dbb981876556 100644 +obj-$(CONFIG_ARM64) += pcie-tegra194.o endif diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c -index 6fa216e52d14..cb38e94a3033 100644 +index 0e94190ca4e8..dfc5d6772e64 100644 --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c @@ -22,6 +22,8 @@ |