← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal-proposed

« back to all changes in this revision

Viewing changes to drivers/net/phy/micrel.c

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft, Ubuntu: 3.5.0-3.3
  • Date: 2012-07-03 09:23:14 UTC
  • Revision ID: package-import@ubuntu.com-20120703092314-wjaqz3coxptokmtl
Tags: 3.5.0-3.3
https://launchpad.net/bugs/1004535
https://launchpad.net/bugs/1006012
https://launchpad.net/bugs/1012800
https://launchpad.net/bugs/1013183
https://launchpad.net/bugs/1017017
https://launchpad.net/bugs/884652
[ Andy Whitcroft ]

* [Config] drop -pae from d-i configuration.
* rebase to Ubuntu-3.5.0-3.3

[ Ubuntu: 3.5.0-3.3 ]

* [Config] enable CONFIG_MEMTEST=y
  - LP: #1004535
* [Config] config-check: add support for a cut operation
* [Config] enforcer -- switch to cut where appropriate
* Rebase to v3.5-rc5
* [Config] Updateconfigs after rebase to v3.5-rc5
* SAUCE: ocfs2: Fix NULL pointer dereferrence in
  __ocfs2_change_file_space
  - LP: #1006012
* SAUCE: (drop after 3.5) drm/i915: ignore pipe select bit when checking
  for LVDS register initialization
  - LP: #1012800
* rebase to v3.5-rc5
  - LP: #1013183
  - LP: #1017017
  - LP: #884652

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/phy/micrel.c
161
161
static struct phy_driver ks8001_driver = {
162
162
        .phy_id         = PHY_ID_KS8001,
163
163
        .name           = "Micrel KS8001 or KS8721",
164
 
        .phy_id_mask    = 0x00fffff0,
 
164
        .phy_id_mask    = 0x00ffffff,
165
165
        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
166
166
        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
167
167
        .config_init    = kszphy_config_init,
174
174
 
175
175
static struct phy_driver ksz9021_driver = {
176
176
        .phy_id         = PHY_ID_KSZ9021,
177
 
        .phy_id_mask    = 0x000fff10,
 
177
        .phy_id_mask    = 0x000ffffe,
178
178
        .name           = "Micrel KSZ9021 Gigabit PHY",
179
179
        .features       = (PHY_GBIT_FEATURES | SUPPORTED_Pause
180
180
                                | SUPPORTED_Asym_Pause),
240
240
MODULE_LICENSE("GPL");
241
241
 
242
242
static struct mdio_device_id __maybe_unused micrel_tbl[] = {
243
 
        { PHY_ID_KSZ9021, 0x000fff10 },
244
 
        { PHY_ID_KS8001, 0x00fffff0 },
 
243
        { PHY_ID_KSZ9021, 0x000ffffe },
 
244
        { PHY_ID_KS8001, 0x00ffffff },
245
245
        { PHY_ID_KS8737, 0x00fffff0 },
246
246
        { PHY_ID_KS8041, 0x00fffff0 },
247
247
        { PHY_ID_KS8051, 0x00fffff0 },