diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-03-09 10:28:43 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-03-09 10:28:43 -0500 |
| commit | 654c39c7982c5314748eda50352dbc35099a2595 (patch) | |
| tree | 43ed8fe28476276c882c4ab13956b2b19f1739ec /include/asm-generic | |
| parent | af40ff687bc9d351030685fde2f57ba45ab4fc14 (diff) | |
| parent | 8dc12538dd14480ffcbcbf18b80dc641ee37e9de (diff) | |
Merge tag 'acpi/iort-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux into aarch64/for-next/core
Three ACPI IORT clean-up patches aimed at v4.17 release cycle:
- Removal of IORT linker script entry re-introduced by mistake by clocksource
drivers refactoring (J.He)
- Two ACPICA guards removal of previously introduced guards to prevent
ACPICA<->kernel patches dependencies (L.Pieralisi)
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 1ab0e520d6fc..58b1dab0cf59 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -589,7 +589,6 @@ | |||
| 589 | IRQCHIP_OF_MATCH_TABLE() \ | 589 | IRQCHIP_OF_MATCH_TABLE() \ |
| 590 | ACPI_PROBE_TABLE(irqchip) \ | 590 | ACPI_PROBE_TABLE(irqchip) \ |
| 591 | ACPI_PROBE_TABLE(timer) \ | 591 | ACPI_PROBE_TABLE(timer) \ |
| 592 | ACPI_PROBE_TABLE(iort) \ | ||
| 593 | EARLYCON_TABLE() | 592 | EARLYCON_TABLE() |
| 594 | 593 | ||
| 595 | #define INIT_TEXT \ | 594 | #define INIT_TEXT \ |