Merge tag 'trace-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[karo-tx-linux.git] / include / asm-generic / vmlinux.lds.h

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 800f9f9677a6cd90955dc33c3efa2cb8acd8f948..f9f56f231ae6265e95635cea499f29c8e948a3c0 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -172,8 +172,7 @@
        KEEP(*(__##name##_of_table))                                    \
        KEEP(*(__##name##_of_table_end))
 
-#define CLKSRC_OF_TABLES()     OF_TABLE(CONFIG_CLKSRC_OF, clksrc)
-#define CLKEVT_OF_TABLES()     OF_TABLE(CONFIG_CLKEVT_OF, clkevt)
+#define TIMER_OF_TABLES()      OF_TABLE(CONFIG_TIMER_OF, timer)
 #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
 #define CLK_OF_TABLES()                OF_TABLE(CONFIG_COMMON_CLK, clk)
 #define IOMMU_OF_TABLES()      OF_TABLE(CONFIG_OF_IOMMU, iommu)
@@ -557,15 +556,15 @@
        MEM_DISCARD(init.rodata)                                        \
        CLK_OF_TABLES()                                                 \
        RESERVEDMEM_OF_TABLES()                                         \
-       CLKSRC_OF_TABLES()                                              \
-       CLKEVT_OF_TABLES()                                              \
+       TIMER_OF_TABLES()                                               \
        IOMMU_OF_TABLES()                                               \
        CPU_METHOD_OF_TABLES()                                          \
        CPUIDLE_METHOD_OF_TABLES()                                      \
        KERNEL_DTB()                                                    \
        IRQCHIP_OF_MATCH_TABLE()                                        \
        ACPI_PROBE_TABLE(irqchip)                                       \
-       ACPI_PROBE_TABLE(clksrc)                                        \
+       ACPI_PROBE_TABLE(timer)                                         \
+       ACPI_PROBE_TABLE(iort)                                          \
        EARLYCON_TABLE()
 
 #define INIT_TEXT                                                      \