diff --git a/[refs] b/[refs] index f10c3cbbc369..62d69c10eeca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba685fb2abd71162bea6895a99449c1071b01402 +refs/heads/master: 09e06f652d86d358583df0b601c0c4d11923dd88 diff --git a/trunk/drivers/net/meth.c b/trunk/drivers/net/meth.c index 92b403bf38b0..32bed6bc6c06 100644 --- a/trunk/drivers/net/meth.c +++ b/trunk/drivers/net/meth.c @@ -405,7 +405,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status) priv->stats.rx_length_errors++; skb = priv->rx_skbs[priv->rx_write]; } else { - skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC | GFP_DMA); + skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC); if (!skb) { /* Ouch! No memory! Drop packet on the floor */ DPRINTK("No mem: dropping packet\n");