Преглед изворни кода

[POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST

The UCC_GETH Kconfig option in drivers/net/Kconfig had a line to select the
UCC_FAST option is arch/powerpc/sysdev/qe_lib/Kconfig, which is only used
on PowerPC builds.  On other architectures, this would generated a warning.
The fix is to have UCC_FAST depend on UCC_GETH.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Timur Tabi пре 18 година
родитељ
комит
90c615bc42
2 измењених фајлова са 1 додато и 4 уклоњено
  1. 1 3
      arch/powerpc/sysdev/qe_lib/Kconfig
  2. 0 1
      drivers/net/Kconfig

+ 1 - 3
arch/powerpc/sysdev/qe_lib/Kconfig

@@ -5,15 +5,13 @@
 config UCC_SLOW
 config UCC_SLOW
 	bool
 	bool
 	default n
 	default n
-	select UCC
 	help
 	help
 	  This option provides qe_lib support to UCC slow
 	  This option provides qe_lib support to UCC slow
 	  protocols: UART, BISYNC, QMC
 	  protocols: UART, BISYNC, QMC
 
 
 config UCC_FAST
 config UCC_FAST
 	bool
 	bool
-	default n
-	select UCC
+	default y if UCC_GETH
 	help
 	help
 	  This option provides qe_lib support to UCC fast
 	  This option provides qe_lib support to UCC fast
 	  protocols: HDLC, Ethernet, ATM, transparent
 	  protocols: HDLC, Ethernet, ATM, transparent

+ 0 - 1
drivers/net/Kconfig

@@ -2280,7 +2280,6 @@ config GFAR_NAPI
 config UCC_GETH
 config UCC_GETH
 	tristate "Freescale QE Gigabit Ethernet"
 	tristate "Freescale QE Gigabit Ethernet"
 	depends on QUICC_ENGINE
 	depends on QUICC_ENGINE
-	select UCC_FAST
 	help
 	help
 	  This driver supports the Gigabit Ethernet mode of the QUICC Engine,
 	  This driver supports the Gigabit Ethernet mode of the QUICC Engine,
 	  which is available on some Freescale SOCs.
 	  which is available on some Freescale SOCs.