diff options
| -rw-r--r-- | arch/powerpc/sysdev/bestcomm/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 3 | ||||
| -rw-r--r-- | sound/soc/fsl/Kconfig | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig index 57cc56562567..0b192a1c429d 100644 --- a/arch/powerpc/sysdev/bestcomm/Kconfig +++ b/arch/powerpc/sysdev/bestcomm/Kconfig | |||
| @@ -17,23 +17,20 @@ config PPC_BESTCOMM | |||
| 17 | answer Y or M. Otherwise say N. | 17 | answer Y or M. Otherwise say N. |
| 18 | 18 | ||
| 19 | config PPC_BESTCOMM_ATA | 19 | config PPC_BESTCOMM_ATA |
| 20 | tristate "Bestcomm ATA task support" | 20 | tristate |
| 21 | depends on PPC_BESTCOMM | 21 | depends on PPC_BESTCOMM |
| 22 | default n | ||
| 23 | help | 22 | help |
| 24 | This option enables the support for the ATA task. | 23 | This option enables the support for the ATA task. |
| 25 | 24 | ||
| 26 | config PPC_BESTCOMM_FEC | 25 | config PPC_BESTCOMM_FEC |
| 27 | tristate "Bestcomm FEC tasks support" | 26 | tristate |
| 28 | depends on PPC_BESTCOMM | 27 | depends on PPC_BESTCOMM |
| 29 | default n | ||
| 30 | help | 28 | help |
| 31 | This option enables the support for the FEC tasks. | 29 | This option enables the support for the FEC tasks. |
| 32 | 30 | ||
| 33 | config PPC_BESTCOMM_GEN_BD | 31 | config PPC_BESTCOMM_GEN_BD |
| 34 | tristate "Bestcomm GenBD tasks support" | 32 | tristate |
| 35 | depends on PPC_BESTCOMM | 33 | depends on PPC_BESTCOMM |
| 36 | default n | ||
| 37 | help | 34 | help |
| 38 | This option enables the support for the GenBD tasks. | 35 | This option enables the support for the GenBD tasks. |
| 39 | 36 | ||
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 11f143f4adf6..231eeaf1d552 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1825,9 +1825,10 @@ config FEC2 | |||
| 1825 | 1825 | ||
| 1826 | config FEC_MPC52xx | 1826 | config FEC_MPC52xx |
| 1827 | tristate "MPC52xx FEC driver" | 1827 | tristate "MPC52xx FEC driver" |
| 1828 | depends on PPC_MPC52xx && PPC_BESTCOMM_FEC | 1828 | depends on PPC_MPC52xx && PPC_BESTCOMM |
| 1829 | select CRC32 | 1829 | select CRC32 |
| 1830 | select PHYLIB | 1830 | select PHYLIB |
| 1831 | select PPC_BESTCOMM_FEC | ||
| 1831 | ---help--- | 1832 | ---help--- |
| 1832 | This option enables support for the MPC5200's on-chip | 1833 | This option enables support for the MPC5200's on-chip |
| 1833 | Fast Ethernet Controller | 1834 | Fast Ethernet Controller |
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index bba9546ba5f5..8d73edc56102 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
| @@ -20,7 +20,8 @@ config SND_SOC_MPC8610_HPCD | |||
| 20 | 20 | ||
| 21 | config SND_SOC_MPC5200_I2S | 21 | config SND_SOC_MPC5200_I2S |
| 22 | tristate "Freescale MPC5200 PSC in I2S mode driver" | 22 | tristate "Freescale MPC5200 PSC in I2S mode driver" |
| 23 | depends on SND_SOC && PPC_MPC52xx && PPC_BESTCOMM | ||
| 23 | select SND_SOC_OF_SIMPLE | 24 | select SND_SOC_OF_SIMPLE |
| 24 | depends on SND_SOC && PPC_MPC52xx | 25 | select PPC_BESTCOMM_GEN_BD |
| 25 | help | 26 | help |
| 26 | Say Y here to support the MPC5200 PSCs in I2S mode. | 27 | Say Y here to support the MPC5200 PSCs in I2S mode. |
