Kumar Gala 83dad4c377 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>		2008-09-24 22:11:53 -04:00
..
core.c	ibm_newemac: Don't call dev_mc_add() before device is registered	2008-08-27 05:55:24 -04:00
core.h
debug.c
debug.h
emac.h
Kconfig	netdev: drop CONFIG_PPC_MERGE from Kconfig	2008-09-24 22:11:53 -04:00
Makefile
mal.c
mal.h	ibm_newemac: MAL[12]_IER_EVENTS definition: 2x *_OTE -> *_DE	2008-09-03 10:03:08 -04:00
phy.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
phy.h
rgmii.c
rgmii.h
tah.c
tah.h
zmii.c
zmii.h