[ARM] Tidy up patch 1925/1

Since each Kconfig file is now bracketed with if ARCH_foo ... endif,
we can remove the individual "depends on ARCH_foo" clauses against
each option.

arch/arm/mach-clps711x/Kconfig

@@ -4,14 +4,12 @@ menu "CLPS711X/EP721X Implementations"
 
 config ARCH_AUTCPU12
 	bool "AUTCPU12"
-	depends on ARCH_CLPS711X
 	help
 	  Say Y if you intend to run the kernel on the autronix autcpu12
 	  board. This board is based on a Cirrus Logic CS89712.
 
 config ARCH_CDB89712
 	bool "CDB89712"
-	depends on ARCH_CLPS711X
 	help
 	  This is an evaluation board from Cirrus for the CS89712 processor.
 	  The board includes 2 serial ports, Ethernet, IRDA, and expansion
@@ -19,32 +17,27 @@ config ARCH_CDB89712
 
 config ARCH_CEIVA
 	bool "CEIVA"
-	depends on ARCH_CLPS711X
 	help
 	  Say Y here if you intend to run this kernel on the Ceiva/Polaroid
 	  PhotoMax Digital Picture Frame.
 
 config ARCH_CLEP7312
 	bool "CLEP7312"
-	depends on ARCH_CLPS711X
 
 config ARCH_EDB7211
 	bool "EDB7211"
-	depends on ARCH_CLPS711X
 	help
 	  Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211
 	  evaluation board.
 
 config ARCH_P720T
 	bool "P720T"
-	depends on ARCH_CLPS711X
 	help
 	  Say Y here if you intend to run this kernel on the ARM Prospector
 	  720T.
 
 config ARCH_FORTUNET
 	bool "FORTUNET"
-	depends on ARCH_CLPS711X
 
 # XXX Maybe these should indicate register compatibility
 # instead of being mutually exclusive.

arch/arm/mach-epxa10db/Kconfig

@@ -3,16 +3,14 @@ if ARCH_CAMELOT
 menu "Epxa10db"
 
 comment "PLD hotswap support"
-	depends on ARCH_CAMELOT
 
 config PLD
 	bool
-	depends on ARCH_CAMELOT
 	default y
 
 config PLD_HOTSWAP
 	bool "Support for PLD device hotplugging (experimental)"
-	depends on ARCH_CAMELOT && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  This enables support for the dynamic loading and configuration of
 	  compatible drivers when the contents of the PLD are changed. This

arch/arm/mach-footbridge/Kconfig

@@ -4,7 +4,6 @@ menu "Footbridge Implementations"
 
 config ARCH_CATS
 	bool "CATS"
-	depends on ARCH_FOOTBRIDGE
 	help
 	  Say Y here if you intend to run this kernel on the CATS.
 
@@ -12,7 +11,6 @@ config ARCH_CATS
 
 config ARCH_PERSONAL_SERVER
 	bool "Compaq Personal Server"
-	depends on ARCH_FOOTBRIDGE
 	---help---
 	  Say Y here if you intend to run this kernel on the Compaq
 	  Personal Server.
@@ -30,7 +28,6 @@ config ARCH_PERSONAL_SERVER
 
 config ARCH_EBSA285_ADDIN
 	bool "EBSA285 (addin mode)"
-	depends on ARCH_FOOTBRIDGE
 	help
 	  Say Y here if you intend to run this kernel on the EBSA285 card
 	  in addin mode.
@@ -39,7 +36,6 @@ config ARCH_EBSA285_ADDIN
 
 config ARCH_EBSA285_HOST
 	bool "EBSA285 (host mode)"
-	depends on ARCH_FOOTBRIDGE
 	help
 	  Say Y here if you intend to run this kernel on the EBSA285 card
 	  in host ("central function") mode.
@@ -48,7 +44,6 @@ config ARCH_EBSA285_HOST
 
 config ARCH_NETWINDER
 	bool "NetWinder"
-	depends on ARCH_FOOTBRIDGE
 	help
 	  Say Y here if you intend to run this kernel on the Rebel.COM
 	  NetWinder.  Information about this machine can be found at:

arch/arm/mach-integrator/Kconfig

 if ARCH_INTEGRATOR
 
 menu "Integrator Options"
-	depends on ARCH_INTEGRATOR
 
 config ARCH_INTEGRATOR_AP
 	bool "Support Integrator/AP and Integrator/PP2 platforms"

arch/arm/mach-iop3xx/Kconfig

@@ -5,7 +5,6 @@ menu "IOP3xx Implementation Options"
 choice
 	prompt "IOP3xx System Type"
 	default ARCH_IQ80310
-	depends on ARCH_IOP3XX
 
 config ARCH_IQ80310
 	bool "IQ80310"
@@ -37,19 +36,19 @@ comment "IOP3xx Chipset Features"
 
 config IOP3XX_AAU
 	bool "Support Intel IOP3xx Application Accelerator Unit (EXPERIMENTAL)"
-	depends on ARCH_IOP3XX && EXPERIMENTAL
+	depends on EXPERIMENTAL
 
 config IOP3XX_DMA
 	bool "Support Intel IOP3xx DMA (EXPERIMENTAL)"
-	depends on ARCH_IOP3XX && EXPERIMENTAL
+	depends on EXPERIMENTAL
 
 config IOP3XX_MU
 	bool "Support Intel IOP3xx Messaging Unit (EXPERIMENTAL)"
-	depends on ARCH_IOP3XX && EXPERIMENTAL
+	depends on EXPERIMENTAL
 
 config IOP3XX_PMON
 	bool "Support Intel IOP3xx Performance Monitor (EXPERIMENTAL)"
-	depends on ARCH_IOP3XX && EXPERIMENTAL
+	depends on EXPERIMENTAL
 
 endmenu
 

arch/arm/mach-ixp4xx/Kconfig

@@ -2,7 +2,6 @@ if ARCH_IXP4XX
 
 config ARCH_SUPPORTS_BIG_ENDIAN
 	bool
-	depends on ARCH_IXP4XX
 	default y
 
 menu "Intel IXP4xx Implementation Options"
@@ -11,7 +10,6 @@ comment "IXP4xx Platforms"
 
 config ARCH_AVILA
 	bool "Avila"
-	depends on ARCH_IXP4XX
 	help
 	  Say 'Y' here if you want your kernel to support the Gateworks
 	  Avila Network Platform. For more information on this platform,
@@ -19,7 +17,6 @@ config ARCH_AVILA
 
 config ARCH_ADI_COYOTE
 	bool "Coyote"
-	depends on ARCH_IXP4XX
 	help
 	  Say 'Y' here if you want your kernel to support the ADI 
 	  Engineering Coyote Gateway Reference Platform. For more
@@ -27,7 +24,6 @@ config ARCH_ADI_COYOTE
 
 config ARCH_IXDP425
 	bool "IXDP425"
-	depends on ARCH_IXP4XX
 	help
 	  Say 'Y' here if you want your kernel to support Intel's 
 	  IXDP425 Development Platform (Also known as Richfield).  
@@ -45,7 +41,6 @@ config ARCH_IXCDP1100
 
 config ARCH_PRPMC1100
 	bool "PrPMC1100"
-	depends on ARCH_IXP4XX
 	help
 	  Say 'Y' here if you want your kernel to support the Motorola
 	  PrPCM1100 Processor Mezanine Module. For more information on
@@ -63,7 +58,6 @@ comment "IXP4xx Options"
 
 config IXP4XX_INDIRECT_PCI
 	bool "Use indirect PCI memory access"
-	depends on ARCH_IXP4XX
 	help
           IXP4xx provides two methods of accessing PCI memory space:
 

arch/arm/mach-lh7a40x/Kconfig

@@ -4,7 +4,6 @@ menu "LH7A40X Implementations"
 
 config MACH_KEV7A400
 	bool "KEV7A400"
-	depends on ARCH_LH7A40X
 	select ARCH_LH7A400
 	help
 	  Say Y here if you are using the Sharp KEV7A400 development
@@ -13,7 +12,6 @@ config MACH_KEV7A400
 
 config MACH_LPD7A400
 	bool "LPD7A400 Card Engine"
-	depends on ARCH_LH7A40X
 	select ARCH_LH7A400
 #	select IDE_POLL
 	help
@@ -23,7 +21,6 @@ config MACH_LPD7A400
 
 config MACH_LPD7A404
 	bool "LPD7A404 Card Engine"
-	depends on ARCH_LH7A40X
 	select ARCH_LH7A404
 #	select IDE_POLL
 	help

arch/arm/mach-omap/Kconfig

@@ -5,24 +5,20 @@ menu "TI OMAP Implementations"
 comment "OMAP Core Type"
 
 config ARCH_OMAP730
-	depends on ARCH_OMAP
 	bool "OMAP730 Based System"
 	select CPU_ARM926T
 
 config ARCH_OMAP1510
-	depends on ARCH_OMAP
 	default y
 	bool "OMAP1510 Based System"
 	select CPU_ARM925T
 	select CPU_DCACHE_WRITETHROUGH
 
 config ARCH_OMAP1610
-	depends on ARCH_OMAP
 	bool "OMAP1610 Based System"
 	select CPU_ARM926T
 
 config ARCH_OMAP5912
-	depends on ARCH_OMAP
 	bool "OMAP5912 Based System"
 	select CPU_ARM926T
 
@@ -88,7 +84,6 @@ comment "OMAP Feature Selections"
 
 #config OMAP_BOOT_TAG
 #	bool "OMAP bootloader information passing"
-#        depends on ARCH_OMAP
 #        default n
 #        help
 #          Say Y, if you have a bootloader which passes information
@@ -96,7 +91,6 @@ comment "OMAP Feature Selections"
 
 config OMAP_MUX
 	bool "OMAP multiplexing support"
-        depends on ARCH_OMAP
 	default y
         help
           Pin multiplexing support for OMAP boards. If your bootloader
@@ -114,7 +108,6 @@ config OMAP_MUX_DEBUG
 
 choice
 	prompt "Low-level debug console UART"
-	depends on ARCH_OMAP
 	default OMAP_LL_DEBUG_UART1
 
 config OMAP_LL_DEBUG_UART1

arch/arm/mach-pxa/Kconfig

@@ -4,7 +4,6 @@ menu "Intel PXA2xx Implementations"
 
 choice
 	prompt "Select target board"
-	depends on ARCH_PXA
 
 config ARCH_LUBBOCK
 	bool "Intel DBPXA250 Development Platform"

arch/arm/mach-s3c2410/Kconfig

@@ -4,7 +4,6 @@ menu "S3C2410 Implementations"
 
 config ARCH_BAST
 	bool "Simtec Electronics BAST (EB2410ITX)"
-	depends on ARCH_S3C2410
 	help
 	  Say Y here if you are using the Simtec Electronics EB2410ITX
 	  development board (also known as BAST)
@@ -13,21 +12,18 @@ config ARCH_BAST
 
 config ARCH_H1940
 	bool "IPAQ H1940"
-	depends on ARCH_S3C2410
 	help
 	  Say Y here if you are using the HP IPAQ H1940
 	  <http://www.handhelds.org/projects/h1940.html>.
 
 config ARCH_SMDK2410
 	bool "SMDK2410/A9M2410"
-	depends on ARCH_S3C2410
 	help
 	   Say Y here if you are using the SMDK2410 or the derived module A9M2410
            <http://www.fsforth.de>
 
 config MACH_VR1000
 	bool "Simtec VR1000"
-	depends on ARCH_S3C2410
 	help
 	  Say Y here if you are using the Simtec VR1000 board.
 

arch/arm/mach-sa1100/Kconfig

@@ -4,7 +4,6 @@ menu "SA11x0 Implementations"
 
 config SA1100_ASSABET
 	bool "Assabet"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
 	  Microprocessor Development Board (also known as the Assabet).
@@ -19,7 +18,6 @@ config ASSABET_NEPONSET
 
 config SA1100_ADSBITSY
 	bool "ADS Bitsy"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using Applied Data Systems Intel(R)
 	  StrongARM(R) 1110 based Bitsy, 3 x 5 inches in size, Compaq - IPAQ -
@@ -29,14 +27,12 @@ config SA1100_ADSBITSY
 
 config SA1100_BRUTUS
 	bool "Brutus"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using the Intel(R) StrongARM(R) SA-1100
 	  Microprocessor Development Board (also known as the Brutus).
 
 config SA1100_CERF
 	bool "CerfBoard"
-	depends on ARCH_SA1100
 	help
 	  The Intrinsyc CerfBoard is based on the StrongARM 1110 (Discontinued).
 	  More information is available at:
@@ -63,7 +59,6 @@ endchoice
 
 config SA1100_H3100
 	bool "Compaq iPAQ H3100"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you intend to run this kernel on the Compaq iPAQ
 	  H3100 handheld computer.  Information about this machine and the
@@ -74,7 +69,6 @@ config SA1100_H3100
 
 config SA1100_H3600
 	bool "Compaq iPAQ H3600/H3700"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you intend to run this kernel on the Compaq iPAQ
 	  H3600 handheld computer.  Information about this machine and the
@@ -85,7 +79,6 @@ config SA1100_H3600
 
 config SA1100_H3800
 	bool "Compaq iPAQ H3800"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you intend to run this kernel on the Compaq iPAQ H3800
 	  series handheld computer.  Information about this machine and the
@@ -103,7 +96,6 @@ config SA1100_H3XXX
 #dep_bool '  Empeg' CONFIG_SA1100_EMPEG $CONFIG_ARCH_SA1100
 config SA1100_EXTENEX1
 	bool "Extenex HandHeld Theater (Squashtail)"
-	depends on ARCH_SA1100
 
 config SA1100_EXTENEX1_16MB
 	bool "Support 16 MB of DRAM (not just 8)"
@@ -111,7 +103,6 @@ config SA1100_EXTENEX1_16MB
 
 config SA1100_FLEXANET
 	bool "FlexaNet"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you intend to run this kernel on the FlexaNet
 	  handheld instruments. Information about this machine can be
@@ -119,14 +110,12 @@ config SA1100_FLEXANET
 
 config SA1100_FREEBIRD
 	bool "FreeBird-v1.1"
-	depends on ARCH_SA1100
 	help
 	  Support the FreeBird board used in Coventive embedded products.  See
 	  Documentation/arm/SA1100/Freebird for more.
 
 config SA1100_GRAPHICSCLIENT
 	bool "GraphicsClient Plus"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using an Applied Data Systems Intel(R)
 	  StrongARM(R) SA-1100 based Graphics Client SBC.  See
@@ -134,7 +123,6 @@ config SA1100_GRAPHICSCLIENT
 
 config SA1100_GRAPHICSMASTER
 	bool "GraphicsMaster"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using an Applied Data Systems Intel(R)
 	  StrongARM(R) SA-1100 based Graphics Master SBC with SA-1111
@@ -144,14 +132,12 @@ config SA1100_GRAPHICSMASTER
 
 config SA1100_BADGE4
 	bool "HP Labs BadgePAD 4"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you want to build a kernel for the HP Laboratories
 	  BadgePAD 4.
 
 config SA1100_JORNADA720
 	bool "HP Jornada 720"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you want to build a kernel for the HP Jornada 720
 	  handheld computer.  See <http://www.hp.com/jornada/products/720>
@@ -159,14 +145,12 @@ config SA1100_JORNADA720
 
 config SA1100_HACKKIT
 	bool "HackKit Core CPU Board"
-	depends on ARCH_SA1100
 	help
 	  Say Y here to support the HackKit Core CPU Board
 	  <http://hackkit.eletztrick.de>;
 
 config SA1100_HUW_WEBPANEL
 	bool "HuW WebPanel"
-	depends on ARCH_SA1100
 	help
 	  Say Y here to support the HuW Webpanel produced by Hoeft & Wessel
 	  AG.  English-language website is at
@@ -175,7 +159,6 @@ config SA1100_HUW_WEBPANEL
 
 config SA1100_ITSY
 	bool "Itsy"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using the Compaq Itsy experimental pocket
 	  computer. See <http://research.compaq.com/wrl/projects/itsy/> for
@@ -183,7 +166,6 @@ config SA1100_ITSY
 
 config SA1100_LART
 	bool "LART"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using the Linux Advanced Radio Terminal
 	  (also known as the LART).  See <http://www.lart.tudelft.nl/> for
@@ -191,7 +173,6 @@ config SA1100_LART
 
 config SA1100_NANOENGINE
 	bool "nanoEngine"
-	depends on ARCH_SA1100
 	help
 	  The nanoEngine is a StrongARM 1110-based single board computer
 	  from Bright Star Engineering. More information is available at:
@@ -202,14 +183,12 @@ config SA1100_NANOENGINE
 
 config SA1100_OMNIMETER
 	bool "OmniMeter"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using the inhand electronics OmniMeter.  See
 	  <http://www.inhandelectronics.com/omnimeter.asp> for details.
 
 config SA1100_PANGOLIN
 	bool "Pangolin"
-	depends on ARCH_SA1100
 	help
 	  Pangolin is a StrongARM 1110-based evaluation platform produced
 	  by Dialogue Technology.  It has EISA slots for ease of configuration
@@ -221,7 +200,6 @@ config SA1100_PANGOLIN
 
 config SA1100_PLEB
 	bool "PLEB"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using a Portable Linux Embedded Board
 	  (also known as PLEB). See <http://www.cse.unsw.edu.au/~pleb/>
@@ -229,7 +207,6 @@ config SA1100_PLEB
 
 config SA1100_PT_SYSTEM3
 	bool "PT System 3"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you intend to build a kernel suitable to run on
 	  a Pruftechnik Digital Board. For more information see
@@ -237,7 +214,6 @@ config SA1100_PT_SYSTEM3
 
 config SA1100_SHANNON
 	bool "Shannon"
-	depends on ARCH_SA1100
 	help
 	  The Shannon (also known as a Tuxscreen, and also as a IS2630) was a
 	  limited edition webphone produced by Philips. The Shannon is a SA1100
@@ -246,7 +222,6 @@ config SA1100_SHANNON
 
 config SA1100_SHERMAN
 	bool "Sherman"
-	depends on ARCH_SA1100
 	help
 	  Say Y here to support the Blazie Engineering `Sherman' StrongARM
 	  1110-based SBC, used primarily in assistance products for the
@@ -256,7 +231,6 @@ config SA1100_SHERMAN
 
 config SA1100_SIMPAD
 	bool "Simpad"
-	depends on ARCH_SA1100
 	help
 	  The SIEMENS webpad SIMpad is based on the StrongARM 1110. There
 	  are two different versions CL4 and SL4. CL4 has 32MB RAM and 16MB
@@ -267,7 +241,6 @@ config SA1100_SIMPAD
 
 config SA1100_PFS168
 	bool "Tulsa"
-	depends on ARCH_SA1100
 	help
 	  The Radisys Corp. PFS-168 (aka Tulsa) is an Intel® StrongArm® SA-1110 based
 	  computer which includes the SA-1111 Microprocessor Companion Chip and other
@@ -277,7 +250,6 @@ config SA1100_PFS168
 
 config SA1100_VICTOR
 	bool "Victor"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you are using a Visu Aide Intel(R) StrongARM(R)
 	  SA-1100 based Victor Digital Talking Book Reader.  See
@@ -286,14 +258,12 @@ config SA1100_VICTOR
 
 config SA1100_XP860
 	bool "XP860"
-	depends on ARCH_SA1100
 	help
 	  :: Config help missing ::
 	  :: 06 August 2002 ::
 
 config SA1100_YOPY
 	bool "Yopy"
-	depends on ARCH_SA1100
 	help
 	  Say Y here to support the Yopy PDA.  Product information at
 	  <http://www.yopy.com/>.  See Documentation/arm/SA1100/Yopy
@@ -301,14 +271,12 @@ config SA1100_YOPY
 
 config SA1100_STORK
 	bool "Stork"
-	depends on ARCH_SA1100
 	help
 	  Say Y here if you intend to run this kernel on the Stork
 	  handheld computer.
 
 #config SA1100_TRIZEPS
 #	bool "Trizeps"
-#	depends on ARCH_SA1100
 #	help
 #	  :: write me ::
 
@@ -320,7 +288,6 @@ config SA1100_STORK
 
 config SA1100_SSP
 	tristate "Generic PIO SSP"
-	depends on ARCH_SA1100
 	help
 	  Say Y here to enable support for the generic PIO SSP driver.
 	  This isn't for audio support, but for attached sensors and
@@ -329,7 +296,6 @@ config SA1100_SSP
 
 config SA1100_USB
 	tristate "SA1100 USB function support"
-	depends on ARCH_SA1100
 
 config SA1100_USB_NETLINK
 	tristate "Support for SA11x0 USB network link function"