uefi-x86: rewrite against rc6
This commit is contained in:
parent
1f09c649ec
commit
45f96e7bf6
@ -18,9 +18,9 @@ diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/Kconfig
|
||||
+++ b/drivers/staging/Kconfig
|
||||
@@ -50,4 +50,6 @@ source "drivers/staging/vme_user/Kconfig"
|
||||
@@ -48,4 +48,6 @@ source "drivers/staging/axis-fifo/Kconfig"
|
||||
|
||||
source "drivers/staging/rtl8723cs/Kconfig"
|
||||
source "drivers/staging/vme_user/Kconfig"
|
||||
|
||||
+source "drivers/staging/apple-bce/Kconfig"
|
||||
+
|
||||
|
||||
@ -21,7 +21,7 @@ diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgp
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
||||
@@ -2382,6 +2382,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
|
||||
@@ -2393,6 +2393,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
|
||||
int ret, retry = 0, i;
|
||||
bool supports_atomic = false;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user