diff options
author | Robin Holt <holt@sgi.com> | 2013-07-08 19:01:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 13:33:29 -0400 |
commit | 58591942789abe1ea18e3fb1e8d8502c70060c29 (patch) | |
tree | ef88cc0b7cafbf10cdfd0c9a59c3ab4544b59fdc /arch/arm | |
parent | c97a7008517abb7c805fbdd49410032a652def26 (diff) |
reboot: arm: remove unused restart_mode fields from some arm subarchs
These restart_mode fields are not used at all. Remove them to make
moving the reboot= cmdline options to the general kernel easier.
Signed-off-by: Robin Holt <holt@sgi.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ebsa110/core.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/tosa.c | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index 8a53f346cdb3..41d2d90afaa3 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c | |||
@@ -321,7 +321,6 @@ MACHINE_START(EBSA110, "EBSA110") | |||
321 | .atag_offset = 0x400, | 321 | .atag_offset = 0x400, |
322 | .reserve_lp0 = 1, | 322 | .reserve_lp0 = 1, |
323 | .reserve_lp2 = 1, | 323 | .reserve_lp2 = 1, |
324 | .restart_mode = 's', | ||
325 | .map_io = ebsa110_map_io, | 324 | .map_io = ebsa110_map_io, |
326 | .init_early = ebsa110_init_early, | 325 | .init_early = ebsa110_init_early, |
327 | .init_irq = ebsa110_init_irq, | 326 | .init_irq = ebsa110_init_irq, |
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 654b0ac84dea..e6b0a936c150 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -761,7 +761,6 @@ static void mioa701_machine_exit(void) | |||
761 | 761 | ||
762 | MACHINE_START(MIOA701, "MIO A701") | 762 | MACHINE_START(MIOA701, "MIO A701") |
763 | .atag_offset = 0x100, | 763 | .atag_offset = 0x100, |
764 | .restart_mode = 's', | ||
765 | .map_io = &pxa27x_map_io, | 764 | .map_io = &pxa27x_map_io, |
766 | .nr_irqs = PXA_NR_IRQS, | 765 | .nr_irqs = PXA_NR_IRQS, |
767 | .init_irq = &pxa27x_init_irq, | 766 | .init_irq = &pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 362726c49c70..c3c00424bb35 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -979,7 +979,6 @@ static void __init spitz_fixup(struct tag *tags, char **cmdline, | |||
979 | 979 | ||
980 | #ifdef CONFIG_MACH_SPITZ | 980 | #ifdef CONFIG_MACH_SPITZ |
981 | MACHINE_START(SPITZ, "SHARP Spitz") | 981 | MACHINE_START(SPITZ, "SHARP Spitz") |
982 | .restart_mode = 'g', | ||
983 | .fixup = spitz_fixup, | 982 | .fixup = spitz_fixup, |
984 | .map_io = pxa27x_map_io, | 983 | .map_io = pxa27x_map_io, |
985 | .nr_irqs = PXA_NR_IRQS, | 984 | .nr_irqs = PXA_NR_IRQS, |
@@ -993,7 +992,6 @@ MACHINE_END | |||
993 | 992 | ||
994 | #ifdef CONFIG_MACH_BORZOI | 993 | #ifdef CONFIG_MACH_BORZOI |
995 | MACHINE_START(BORZOI, "SHARP Borzoi") | 994 | MACHINE_START(BORZOI, "SHARP Borzoi") |
996 | .restart_mode = 'g', | ||
997 | .fixup = spitz_fixup, | 995 | .fixup = spitz_fixup, |
998 | .map_io = pxa27x_map_io, | 996 | .map_io = pxa27x_map_io, |
999 | .nr_irqs = PXA_NR_IRQS, | 997 | .nr_irqs = PXA_NR_IRQS, |
@@ -1007,7 +1005,6 @@ MACHINE_END | |||
1007 | 1005 | ||
1008 | #ifdef CONFIG_MACH_AKITA | 1006 | #ifdef CONFIG_MACH_AKITA |
1009 | MACHINE_START(AKITA, "SHARP Akita") | 1007 | MACHINE_START(AKITA, "SHARP Akita") |
1010 | .restart_mode = 'g', | ||
1011 | .fixup = spitz_fixup, | 1008 | .fixup = spitz_fixup, |
1012 | .map_io = pxa27x_map_io, | 1009 | .map_io = pxa27x_map_io, |
1013 | .nr_irqs = PXA_NR_IRQS, | 1010 | .nr_irqs = PXA_NR_IRQS, |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 3d91d2e5bf3a..a41992fea720 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
@@ -969,7 +969,6 @@ static void __init fixup_tosa(struct tag *tags, char **cmdline, | |||
969 | } | 969 | } |
970 | 970 | ||
971 | MACHINE_START(TOSA, "SHARP Tosa") | 971 | MACHINE_START(TOSA, "SHARP Tosa") |
972 | .restart_mode = 'g', | ||
973 | .fixup = fixup_tosa, | 972 | .fixup = fixup_tosa, |
974 | .map_io = pxa25x_map_io, | 973 | .map_io = pxa25x_map_io, |
975 | .nr_irqs = TOSA_NR_IRQS, | 974 | .nr_irqs = TOSA_NR_IRQS, |