Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

diff --combined drivers/net/arm/ixp4xx_eth.c
index 020771bfb6039839becfdda79f4d1d085a2912f3,7d5db2ece1bd0f2bc3335dd340cb46ee296cee64..e2d702b8b2e4766321824c26941074b40c950fa5
--- 1/drivers/net/arm/ixp4xx_eth.c
--- 2/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@@ -32,8 -32,8 +32,8 @@@
  #include <linux/kernel.h>
  #include <linux/mii.h>
  #include <linux/platform_device.h>
 -#include <asm/arch/npe.h>
 -#include <asm/arch/qmgr.h>
 +#include <mach/npe.h>
 +#include <mach/qmgr.h>
  
  #define DEBUG_QUEUES          0
  #define DEBUG_DESC            0
@@@ -551,7 -551,7 +551,7 @@@ static int eth_poll(struct napi_struct 
                if ((skb = netdev_alloc_skb(dev, RX_BUFF_SIZE))) {
                        phys = dma_map_single(&dev->dev, skb->data,
                                              RX_BUFF_SIZE, DMA_FROM_DEVICE);
-                       if (dma_mapping_error(phys)) {
+                       if (dma_mapping_error(&dev->dev, phys)) {
                                dev_kfree_skb(skb);
                                skb = NULL;
                        }
@@@ -698,7 -698,7 +698,7 @@@ static int eth_xmit(struct sk_buff *skb
  #endif
  
        phys = dma_map_single(&dev->dev, mem, bytes, DMA_TO_DEVICE);
-       if (dma_mapping_error(phys)) {
+       if (dma_mapping_error(&dev->dev, phys)) {
  #ifdef __ARMEB__
                dev_kfree_skb(skb);
  #else
@@@ -883,7 -883,7 +883,7 @@@ static int init_queues(struct port *por
                desc->buf_len = MAX_MRU;
                desc->data = dma_map_single(&port->netdev->dev, data,
                                            RX_BUFF_SIZE, DMA_FROM_DEVICE);
-               if (dma_mapping_error(desc->data)) {
+               if (dma_mapping_error(&port->netdev->dev, desc->data)) {
                        free_buffer(buff);
                        return -EIO;
                }