diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 04:01:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 04:01:23 -0400 |
| commit | ab1623da2b6659fa9e7810362430de482ebdb9cf (patch) | |
| tree | b1d8a3dd9ca48886173d19b681d167455e57cc56 /drivers/net/skge.c | |
| parent | 5b85f29ca453d56d83cdffa075d615583bb8fb72 (diff) | |
| parent | dc710afe95ee9b263ab593c11d86a684f1606872 (diff) | |
| download | kernel-crypto-ab1623da2b6659fa9e7810362430de482ebdb9cf.tar.gz kernel-crypto-ab1623da2b6659fa9e7810362430de482ebdb9cf.tar.xz kernel-crypto-ab1623da2b6659fa9e7810362430de482ebdb9cf.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/skge.c')
| -rw-r--r-- | drivers/net/skge.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 82200bfaa8e..7de9a07b2ac 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -516,10 +516,7 @@ static int skge_set_pauseparam(struct net_device *dev, /* Chip internal frequency for clock calculations */ static inline u32 hwkhz(const struct skge_hw *hw) { - if (hw->chip_id == CHIP_ID_GENESIS) - return 53215; /* or: 53.125 MHz */ - else - return 78215; /* or: 78.125 MHz */ + return (hw->chip_id == CHIP_ID_GENESIS) ? 53125 : 78125; } /* Chip HZ to microseconds */ |