← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/smc91x.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/smc91x.c
81
81
#include <linux/ethtool.h>
82
82
#include <linux/mii.h>
83
83
#include <linux/workqueue.h>
 
84
#include <linux/of.h>
84
85
 
85
86
#include <linux/netdevice.h>
86
87
#include <linux/etherdevice.h>
1564
1565
                                 SUPPORTED_TP | SUPPORTED_AUI;
1565
1566
 
1566
1567
                if (lp->ctl_rspeed == 10)
1567
 
                        cmd->speed = SPEED_10;
 
1568
                        ethtool_cmd_speed_set(cmd, SPEED_10);
1568
1569
                else if (lp->ctl_rspeed == 100)
1569
 
                        cmd->speed = SPEED_100;
 
1570
                        ethtool_cmd_speed_set(cmd, SPEED_100);
1570
1571
 
1571
1572
                cmd->autoneg = AUTONEG_DISABLE;
1572
1573
                cmd->transceiver = XCVR_INTERNAL;
2394
2395
        return 0;
2395
2396
}
2396
2397
 
 
2398
#ifdef CONFIG_OF
 
2399
static const struct of_device_id smc91x_match[] = {
 
2400
        { .compatible = "smsc,lan91c94", },
 
2401
        { .compatible = "smsc,lan91c111", },
 
2402
        {},
 
2403
};
 
2404
MODULE_DEVICE_TABLE(of, smc91x_match);
 
2405
#else
 
2406
#define smc91x_match NULL
 
2407
#endif
 
2408
 
2397
2409
static struct dev_pm_ops smc_drv_pm_ops = {
2398
2410
        .suspend        = smc_drv_suspend,
2399
2411
        .resume         = smc_drv_resume,
2406
2418
                .name   = CARDNAME,
2407
2419
                .owner  = THIS_MODULE,
2408
2420
                .pm     = &smc_drv_pm_ops,
 
2421
                .of_match_table = smc91x_match,
2409
2422
        },
2410
2423
};
2411
2424