diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-09-22 14:52:19 -0700 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 22:11:53 -0400 |
commit | 83dad4c3773b2be110f9ab0c9031e6129bd2e294 (patch) | |
tree | 1ba35395a8ed73a080e7520bd0436e9ebf2552c8 /drivers/net/fs_enet/fs_enet.h | |
parent | e2f092ff9bf2ab515c14d2208b5f08c7d389d5d2 (diff) |
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>
Diffstat (limited to 'drivers/net/fs_enet/fs_enet.h')
0 files changed, 0 insertions, 0 deletions