diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/net/ucc_geth.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/ucc_geth.c')
| -rw-r--r-- | drivers/net/ucc_geth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 31c97a6591a4..a2fc2bbcf97f 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
| @@ -3939,8 +3939,8 @@ static void ugeth_phy_startup_timer(unsigned long data) | |||
| 3939 | /* Grab the PHY interrupt, if necessary/possible */ | 3939 | /* Grab the PHY interrupt, if necessary/possible */ |
| 3940 | if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR) { | 3940 | if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR) { |
| 3941 | if (request_irq(ugeth->ug_info->phy_interrupt, | 3941 | if (request_irq(ugeth->ug_info->phy_interrupt, |
| 3942 | phy_interrupt, | 3942 | phy_interrupt, IRQF_SHARED, |
| 3943 | SA_SHIRQ, "phy_interrupt", mii_info->dev) < 0) { | 3943 | "phy_interrupt", mii_info->dev) < 0) { |
| 3944 | ugeth_err("%s: Can't get IRQ %d (PHY)", | 3944 | ugeth_err("%s: Can't get IRQ %d (PHY)", |
| 3945 | mii_info->dev->name, | 3945 | mii_info->dev->name, |
| 3946 | ugeth->ug_info->phy_interrupt); | 3946 | ugeth->ug_info->phy_interrupt); |