rapidio: modify initialization of switch operations

Modify the way how RapidIO switch operations are declared.  Multiple
assignments through the linker script replaced by single initialization
call.

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Thomas Moll <thomas.moll@sysgo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 6 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 8f7c89b20639..ef779c6fc3d7 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -248,12 +248,9 @@
                                                                         \
         /* RapidIO route ops */                                         \
         .rio_ops        : AT(ADDR(.rio_ops) - LOAD_OFFSET) {            \
-                VMLINUX_SYMBOL(__start_rio_route_ops) = .;              \
-                *(.rio_route_ops)                                       \
-                VMLINUX_SYMBOL(__end_rio_route_ops) = .;                \
-                VMLINUX_SYMBOL(__start_rio_em_ops) = .;                 \
-                *(.rio_em_ops)                                          \
-                VMLINUX_SYMBOL(__end_rio_em_ops) = .;                   \
+                VMLINUX_SYMBOL(__start_rio_switch_ops) = .;             \
+                *(.rio_switch_ops)                                      \
+                VMLINUX_SYMBOL(__end_rio_switch_ops) = .;               \
         }                                                               \
                                                                         \
         TRACEDATA                                                       \