diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-06-29 15:48:12 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-06-29 15:48:12 +0100 |
| commit | fb2bbe6d40539e74fc890d529c370e6b977fbf47 (patch) | |
| tree | 41c5bbfcae5617b46bf32400fd17372bf30b3ec3 /drivers/net/phy | |
| parent | 74da01dcfbb6300d758490d5d4efa1314c0e4e8b (diff) | |
| parent | 0a01063d5fd7417175512f0f916629008c0a842e (diff) | |
Merge branch 'drm-fixes' of /home/airlied/devel/kernel/linux-2.6 into drm-core-nextdrm-radeon-testing
* 'drm-fixes' of /home/airlied/devel/kernel/linux-2.6: (186 commits)
drm/radeon: disable any GPU activity after unrecovered lockup v5
drm/radeon: fix VM page table setup on SI
watchdog: core: fix WDIOC_GETSTATUS return value
watchdog: hpwdt: Unregister NMI events on exit.
watchdog: iTCO_wdt: add platform driver module alias
udf: Fortify loading of sparing table
udf: Avoid run away loop when partition table length is corrupted
udf: Use 'ret' instead of abusing 'i' in udf_load_logicalvol()
sh: Convert sh_clk_mstp32_register to sh_clk_mstp_register
sh: kfr2r09: fix compile breakage
9p: fix min_t() casting in p9pdu_vwritef()
chmod +x scripts/gfp-translate
Revert "drm/i915: allow PCH PWM override on IVB"
UBI: correct usage of IS_ENABLED()
UBIFS: correct usage of IS_ENABLED()
can: flexcan: use be32_to_cpup to handle the value of dt entry
drm/nouveau: add license header to prime.
xen/netfront: teardown the device before unregistering it.
bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)
vhost: use USER_DS in vhost_worker thread
...
Conflicts:
drivers/gpu/drm/i915/intel_display.c
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/micrel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 590f902deb6b..9d6c80c8a0cf 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -161,7 +161,7 @@ static struct phy_driver ks8051_driver = { static struct phy_driver ks8001_driver = { .phy_id = PHY_ID_KS8001, .name = "Micrel KS8001 or KS8721", - .phy_id_mask = 0x00fffff0, + .phy_id_mask = 0x00ffffff, .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .config_init = kszphy_config_init, @@ -174,7 +174,7 @@ static struct phy_driver ks8001_driver = { static struct phy_driver ksz9021_driver = { .phy_id = PHY_ID_KSZ9021, - .phy_id_mask = 0x000fff10, + .phy_id_mask = 0x000ffffe, .name = "Micrel KSZ9021 Gigabit PHY", .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause | SUPPORTED_Asym_Pause), @@ -240,8 +240,8 @@ MODULE_AUTHOR("David J. Choi"); MODULE_LICENSE("GPL"); static struct mdio_device_id __maybe_unused micrel_tbl[] = { - { PHY_ID_KSZ9021, 0x000fff10 }, - { PHY_ID_KS8001, 0x00fffff0 }, + { PHY_ID_KSZ9021, 0x000ffffe }, + { PHY_ID_KS8001, 0x00ffffff }, { PHY_ID_KS8737, 0x00fffff0 }, { PHY_ID_KS8041, 0x00fffff0 }, { PHY_ID_KS8051, 0x00fffff0 }, |