ARM: config: sort select statements alphanumerically

As suggested by Andrew Morton:

  This is a pet peeve of mine.  Any time there's a long list of items
  (header file inclusions, kconfig entries, array initalisers, etc) and
  someone wants to add a new item, they *always* go and stick it at the
  end of the list.

  Guys, don't do this.  Either put the new item into a randomly-chosen
  position or, probably better, alphanumerically sort the list.

lets sort all our select statements alphanumerically.  This commit was
created by the following perl:

while (<>) {
	while (/\\\s*$/) {
		$_ .= <>;
	}
	undef %selects if /^\s*config\s+/;
	if (/^\s+select\s+(\w+).*/) {
		if (defined($selects{$1})) {
			if ($selects{$1} eq $_) {
				print STDERR "Warning: removing duplicated $1 entry\n";
			} else {
				print STDERR "Error: $1 differently selected\n".
					"\tOld: $selects{$1}\n".
					"\tNew: $_\n";
				exit 1;
			}
		}
		$selects{$1} = $_;
		next;
	}
	if (%selects and (/^\s*$/ or /^\s+help/ or /^\s+---help---/ or
			  /^endif/ or /^endchoice/)) {
		foreach $k (sort (keys %selects)) {
			print "$selects{$k}";
		}
		undef %selects;
	}
	print;
}
if (%selects) {
	foreach $k (sort (keys %selects)) {
		print "$selects{$k}";
	}
}

It found two duplicates:

Warning: removing duplicated S5P_SETUP_MIPIPHY entry
Warning: removing duplicated HARDIRQS_SW_RESEND entry

and they are identical duplicates, hence the shrinkage in the diffstat
of two lines.

We have four testers reporting success of this change (Tony, Stephen,
Linus and Sekhar.)

Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 13 insertions, 13 deletions

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index c8050b14e615..b14207101938 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -19,8 +19,8 @@ config AT91_SAM9G45_RESET
 
 config SOC_AT91SAM9
         bool
-        select GENERIC_CLOCKEVENTS
         select CPU_ARM926T
+        select GENERIC_CLOCKEVENTS
 
 menu "Atmel AT91 System-on-Chip"
 
@@ -28,66 +28,66 @@ comment "Atmel AT91 Processor"
 
 config SOC_AT91SAM9
         bool
+        select AT91_SAM9_SMC
+        select AT91_SAM9_TIME
         select CPU_ARM926T
         select MULTI_IRQ_HANDLER
         select SPARSE_IRQ
-        select AT91_SAM9_TIME
-        select AT91_SAM9_SMC
 
 config SOC_AT91RM9200
         bool "AT91RM9200"
         select CPU_ARM920T
-        select MULTI_IRQ_HANDLER
-        select SPARSE_IRQ
         select GENERIC_CLOCKEVENTS
         select HAVE_AT91_DBGU0
+        select MULTI_IRQ_HANDLER
+        select SPARSE_IRQ
 
 config SOC_AT91SAM9260
         bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_NET_MACB
+        select SOC_AT91SAM9
         help
           Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
           or AT91SAM9G20 SoC.
 
 config SOC_AT91SAM9261
         bool "AT91SAM9261 or AT91SAM9G10"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
+        select SOC_AT91SAM9
         help
           Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
 
 config SOC_AT91SAM9263
         bool "AT91SAM9263"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU1
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select SOC_AT91SAM9
 
 config SOC_AT91SAM9RL
         bool "AT91SAM9RL"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
+        select SOC_AT91SAM9
 
 config SOC_AT91SAM9G45
         bool "AT91SAM9G45 or AT91SAM9M10 families"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU1
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select SOC_AT91SAM9
         help
           Select this if you are using one of Atmel's AT91SAM9G45 family SoC.
           This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
 
 config SOC_AT91SAM9X5
         bool "AT91SAM9x5 family"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select SOC_AT91SAM9
         help
           Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
           This means that your SAM9 name finishes with a '5' (except if it is
@@ -97,9 +97,9 @@ config SOC_AT91SAM9X5
 
 config SOC_AT91SAM9N12
         bool "AT91SAM9N12 family"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
+        select SOC_AT91SAM9
         help
           Select this if you are using Atmel's AT91SAM9N12 SoC.
 
@@ -144,9 +144,9 @@ config ARCH_AT91SAM9G45
 config ARCH_AT91X40
         bool "AT91x40"
         depends on !MMU
+        select ARCH_USES_GETTIMEOFFSET
         select MULTI_IRQ_HANDLER
         select SPARSE_IRQ
-        select ARCH_USES_GETTIMEOFFSET
 
 endchoice