← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-omap/trusty

« back to all changes in this revision

Viewing changes to drivers/net/smc91x.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-57i0gl3v99b3lkfg
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/smc91x.c
1565
1565
                                 SUPPORTED_TP | SUPPORTED_AUI;
1566
1566
 
1567
1567
                if (lp->ctl_rspeed == 10)
1568
 
                        cmd->speed = SPEED_10;
 
1568
                        ethtool_cmd_speed_set(cmd, SPEED_10);
1569
1569
                else if (lp->ctl_rspeed == 100)
1570
 
                        cmd->speed = SPEED_100;
 
1570
                        ethtool_cmd_speed_set(cmd, SPEED_100);
1571
1571
 
1572
1572
                cmd->autoneg = AUTONEG_DISABLE;
1573
1573
                cmd->transceiver = XCVR_INTERNAL;
2400
2400
        { .compatible = "smsc,lan91c94", },
2401
2401
        { .compatible = "smsc,lan91c111", },
2402
2402
        {},
2403
 
}
 
2403
};
2404
2404
MODULE_DEVICE_TABLE(of, smc91x_match);
 
2405
#else
 
2406
#define smc91x_match NULL
2405
2407
#endif
2406
2408
 
2407
2409
static struct dev_pm_ops smc_drv_pm_ops = {
2416
2418
                .name   = CARDNAME,
2417
2419
                .owner  = THIS_MODULE,
2418
2420
                .pm     = &smc_drv_pm_ops,
2419
 
#ifdef CONFIG_OF
2420
2421
                .of_match_table = smc91x_match,
2421
 
#endif
2422
2422
        },
2423
2423
};
2424
2424