]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
fs-enet: remove code associated with !CONFIG_PPC_MERGE
authorKumar Gala <galak@kernel.crashing.org>
Mon, 22 Sep 2008 21:52:18 +0000 (14:52 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 25 Sep 2008 02:11:57 +0000 (22:11 -0400)
commit315781408ef4a6ff831f8fd37c90d4bb7c234853
tree43ee75ef4b3c1fbb1a247446ed34a5dc5f4478fb
parent83dad4c3773b2be110f9ab0c9031e6129bd2e294
fs-enet: remove code associated with !CONFIG_PPC_MERGE

Now that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore remove
the dead code associated with !CONFIG_PPC_MERGE.

With this change the pre_request_irq() and post_free_irq() calls became
nops so they have been removed.  Also removed fs_request_irq() and
fs_free_irq() and just called request_irq() and free_irq().

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/fs_enet/fs_enet-main.c
drivers/net/fs_enet/fs_enet.h
drivers/net/fs_enet/mac-fcc.c
drivers/net/fs_enet/mac-fec.c
drivers/net/fs_enet/mac-scc.c