diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 08:39:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 08:39:49 -0800 |
| commit | d3143e71a95fe504c3d2d4a3b7aac126a588b1ac (patch) | |
| tree | 78cf757c2896c3b5977e9a53d77642916ba7523e /drivers/net/phy/fixed.c | |
| parent | b20c8453a7d6e8d63c0f05ba3e38d9428c8091b1 (diff) | |
| parent | 90afd0e574a1a739aeb62e30d556ebf0289389e5 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
Broadcom 4400 resume small fix
b44: src_desc->addr is little-endian
e100: fix irq leak on suspend/resume
bonding: ARP monitoring broken on x86_64
ehea: Fixed missing tasklet_kill() call
ehea: Fixed wrong jumbo frames status query
82596 warning fixes
FS_ENET: OF-related fixup for FEC and SCC MAC's
net: ifb error path loop fix
b44: Fix frequent link changes
Diffstat (limited to 'drivers/net/phy/fixed.c')
| -rw-r--r-- | drivers/net/phy/fixed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index 096d4a100bf..86135397f43 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c @@ -349,7 +349,7 @@ static int __init fixed_init(void) fixed_mdio_register_device(0, 100, 1); #endif -#ifdef CONFIX_FIXED_MII_10_FDX +#ifdef CONFIG_FIXED_MII_10_FDX fixed_mdio_register_device(0, 10, 1); #endif return 0; |