Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / drivers / net / fs_enet / mac-scc.c

diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 65925b5a224f761afdb169762e376f7d4c3890a0..7540966687ec24a84cc2064b9cb8b752e7c37947 100644 (file)
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
@@ -168,7 +167,7 @@ static int allocate_bd(struct net_device *dev)
 
        fep->ring_mem_addr = cpm_dpalloc((fpi->tx_ring + fpi->rx_ring) *
                                         sizeof(cbd_t), 8);
-       if (IS_DPERR(fep->ring_mem_addr))
+       if (IS_ERR_VALUE(fep->ring_mem_addr))
                return -ENOMEM;
 
        fep->ring_base = cpm_dpram_addr(fep->ring_mem_addr);