diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-11 08:48:06 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-11 08:48:06 -0400 |
| commit | 853ea7612f7b0c819c1ff5e33ae45f185aed504a (patch) | |
| tree | 59498c359f01aa756a539653da427fa4e69cdfc7 /kernel-arm64.patch | |
| parent | 4c98a00d3e7ff8f369ded48bcd188dd4c0b0c92a (diff) | |
| download | kernel-853ea7612f7b0c819c1ff5e33ae45f185aed504a.tar.gz kernel-853ea7612f7b0c819c1ff5e33ae45f185aed504a.tar.xz kernel-853ea7612f7b0c819c1ff5e33ae45f185aed504a.zip | |
Linux v4.0-rc3-111-gaffb8172de39
- Reenable debugging options.
Diffstat (limited to 'kernel-arm64.patch')
| -rw-r--r-- | kernel-arm64.patch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel-arm64.patch b/kernel-arm64.patch index 19b636683..51529ac12 100644 --- a/kernel-arm64.patch +++ b/kernel-arm64.patch @@ -17484,7 +17484,7 @@ index 869d97f..29aad5e 100644 if (!xgene_ring_mgr_init(pdata)) return -ENODEV; -- if (!efi_enabled(EFI_BOOT)) { +- if (pdata->clk) { - clk_prepare_enable(pdata->clk); - clk_disable_unprepare(pdata->clk); - clk_prepare_enable(pdata->clk); @@ -17788,13 +17788,15 @@ index 44b1537..a4a53a7 100644 } static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata) -@@ -1031,18 +1031,18 @@ MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match); +@@ -1033,20 +1033,20 @@ MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match); #endif #ifdef CONFIG_OF -static struct of_device_id xgene_enet_of_match[] = { +static struct of_device_id xgene_enet_match[] = { {.compatible = "apm,xgene-enet",}, + {.compatible = "apm,xgene1-sgenet",}, + {.compatible = "apm,xgene1-xgenet",}, {}, }; |