Merge branch 'x86/irq' into x86/apic

Merge reason:
	Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index f983e3b507cc..103e8b0e2a0d 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -741,14 +741,14 @@ static int efx_probe_port(struct efx_nic *efx)
 
         EFX_LOG(efx, "create port\n");
 
+        if (phy_flash_cfg)
+                efx->phy_mode = PHY_MODE_SPECIAL;
+
         /* Connect up MAC/PHY operations table */
         rc = efx->type->probe_port(efx);
         if (rc)
                 goto err;
 
-        if (phy_flash_cfg)
-                efx->phy_mode = PHY_MODE_SPECIAL;
-
         /* Sanity check MAC address */
         if (is_valid_ether_addr(efx->mac_address)) {
                 memcpy(efx->net_dev->dev_addr, efx->mac_address, ETH_ALEN);