Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 83dad4c3773b2be110f9ab0c9031e6129bd2e294

Authored by Kumar Gala
Committed by Jeff Garzik
1 parent e2f092ff9b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

netdev: drop CONFIG_PPC_MERGE from Kconfig 

Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all
powerpc platforms so we don't need to depend on it.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -1813,7 +1813,7 @@
1813 1813  
1814 1814 config FEC_MPC52xx
1815 1815 tristate "MPC52xx FEC driver"
1816   - depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC
  1816 + depends on PPC_MPC52xx && PPC_BESTCOMM_FEC
1817 1817 select CRC32
1818 1818 select PHYLIB
1819 1819 ---help---
drivers/net/ibm_newemac/Kconfig
Diff comments   View file @ 83dad4c
1 1 config IBM_NEW_EMAC
2 2 tristate "IBM EMAC Ethernet support"
3   - depends on PPC_DCR && PPC_MERGE
  3 + depends on PPC_DCR
4 4 select CRC32
5 5 help
6 6 This driver supports the IBM EMAC family of Ethernet controllers