diff --git a/[refs] b/[refs] index 5d3c017f646d..491da67ec4d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a35528a8346f6e6fd32ed7e51f04d1fa4ca2c01 +refs/heads/master: e911e0d9af90e4f1b4f2cf183a0993f9fed9f9c6 diff --git a/trunk/drivers/net/dl2k.c b/trunk/drivers/net/dl2k.c index c749e9fb47ef..4a1b554654eb 100644 --- a/trunk/drivers/net/dl2k.c +++ b/trunk/drivers/net/dl2k.c @@ -714,7 +714,7 @@ rio_interrupt (int irq, void *dev_instance) static inline dma_addr_t desc_to_dma(struct netdev_desc *desc) { - return le64_to_cpu(desc->fraginfo) & DMA_48BIT_MASK; + return le64_to_cpu(desc->fraginfo) & DMA_BIT_MASK(48); } static void