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/lp486e.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/lp486e.c')
| -rw-r--r-- | drivers/net/lp486e.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index 3df046a58b1d..385a95311cd2 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | Credits: | 28 | Credits: |
| 29 | Thanks to Murphy Software BV for letting me write this in their time. | 29 | Thanks to Murphy Software BV for letting me write this in their time. |
| 30 | Well, actually, I get payed doing this... | 30 | Well, actually, I get paid doing this... |
| 31 | (Also: see http://www.murphy.nl for murphy, and my homepage ~ard for | 31 | (Also: see http://www.murphy.nl for murphy, and my homepage ~ard for |
| 32 | more information on the Professional Workstation) | 32 | more information on the Professional Workstation) |
| 33 | 33 | ||
| @@ -460,7 +460,7 @@ init_rx_bufs(struct net_device *dev, int num) { | |||
| 460 | } | 460 | } |
| 461 | lp->rbd_tail->next = rfd->rbd; | 461 | lp->rbd_tail->next = rfd->rbd; |
| 462 | #endif | 462 | #endif |
| 463 | return (i); | 463 | return i; |
| 464 | } | 464 | } |
| 465 | 465 | ||
| 466 | static inline void | 466 | static inline void |