From: Kumar Gala <galak@kernel.crashing.org>
Date: Mon, 22 Sep 2008 21:52:19 +0000 (-0700)
Subject: netdev: drop CONFIG_PPC_MERGE from Kconfig
X-Git-Tag: v2.6.28-rc1~717^2~178
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83dad4c3773b2be110f9ab0c9031e6129bd2e294;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed