Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
[~shefty/rdma-dev.git] / drivers / net / ethernet / smsc / smc91x.c
index 0dba0501b7120b15d34d6a2bd381dfcb9e26300a..fee44935501461663a1417c5a10b209f33da393e 100644 (file)
@@ -463,7 +463,7 @@ static inline void  smc_rcv(struct net_device *dev)
                 * multiple of 4 bytes on 32 bit buses.
                 * Hence packet_len - 6 + 2 + 2 + 2.
                 */
-               skb = dev_alloc_skb(packet_len);
+               skb = netdev_alloc_skb(dev, packet_len);
                if (unlikely(skb == NULL)) {
                        printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",
                                dev->name);
@@ -2223,7 +2223,6 @@ static int __devinit smc_drv_probe(struct platform_device *pdev)
 
        ndev = alloc_etherdev(sizeof(struct smc_local));
        if (!ndev) {
-               printk("%s: could not allocate device.\n", CARDNAME);
                ret = -ENOMEM;
                goto out;
        }