diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/3c507.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/3c507.c')
| -rw-r--r-- | drivers/net/3c507.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index ea9b7a098c9b..1e945551c144 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c | |||
| @@ -201,7 +201,7 @@ struct net_local { | |||
| 201 | #define RX_BUF_SIZE (1518+14+18) /* packet+header+RBD */ | 201 | #define RX_BUF_SIZE (1518+14+18) /* packet+header+RBD */ |
| 202 | #define RX_BUF_END (dev->mem_end - dev->mem_start) | 202 | #define RX_BUF_END (dev->mem_end - dev->mem_start) |
| 203 | 203 | ||
| 204 | #define TX_TIMEOUT 5 | 204 | #define TX_TIMEOUT (HZ/20) |
| 205 | 205 | ||
| 206 | /* | 206 | /* |
| 207 | That's it: only 86 bytes to set up the beast, including every extra | 207 | That's it: only 86 bytes to set up the beast, including every extra |
| @@ -311,8 +311,8 @@ static int mem_start; | |||
| 311 | struct net_device * __init el16_probe(int unit) | 311 | struct net_device * __init el16_probe(int unit) |
| 312 | { | 312 | { |
| 313 | struct net_device *dev = alloc_etherdev(sizeof(struct net_local)); | 313 | struct net_device *dev = alloc_etherdev(sizeof(struct net_local)); |
| 314 | static unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0}; | 314 | static const unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0}; |
| 315 | unsigned *port; | 315 | const unsigned *port; |
| 316 | int err = -ENODEV; | 316 | int err = -ENODEV; |
| 317 | 317 | ||
| 318 | if (!dev) | 318 | if (!dev) |