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/de620.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/de620.c')
| -rw-r--r-- | drivers/net/de620.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index f3650fd096f4..1c51a7576119 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c | |||
| @@ -676,7 +676,7 @@ static int de620_rx_intr(struct net_device *dev) | |||
| 676 | de620_set_register(dev, W_NPRF, next_rx_page); | 676 | de620_set_register(dev, W_NPRF, next_rx_page); |
| 677 | pr_debug("next_rx_page=%d CPR=%d\n", next_rx_page, curr_page); | 677 | pr_debug("next_rx_page=%d CPR=%d\n", next_rx_page, curr_page); |
| 678 | 678 | ||
| 679 | return (next_rx_page != curr_page); /* That was slightly tricky... */ | 679 | return next_rx_page != curr_page; /* That was slightly tricky... */ |
| 680 | } | 680 | } |
| 681 | 681 | ||
| 682 | /********************************************* | 682 | /********************************************* |