diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-01 10:37:25 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-01 10:37:25 +1000 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/net/skge.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
| download | kernel_samsung_aries-57cad8084e0837e0f2c97da789ec9b3f36809be9.zip kernel_samsung_aries-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.gz kernel_samsung_aries-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.bz2 | |
Merge branch 'merge'
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 82200bf..7de9a07 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 */ |