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/appletalk/ltpc.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/appletalk/ltpc.c')
| -rw-r--r-- | drivers/net/appletalk/ltpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index adc07551739e..e69eead12ec7 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
| @@ -727,7 +727,7 @@ static int sendup_buffer (struct net_device *dev) | |||
| 727 | 727 | ||
| 728 | if (ltc->command != LT_RCVLAP) { | 728 | if (ltc->command != LT_RCVLAP) { |
| 729 | printk("unknown command 0x%02x from ltpc card\n",ltc->command); | 729 | printk("unknown command 0x%02x from ltpc card\n",ltc->command); |
| 730 | return(-1); | 730 | return -1; |
| 731 | } | 731 | } |
| 732 | dnode = ltc->dnode; | 732 | dnode = ltc->dnode; |
| 733 | snode = ltc->snode; | 733 | snode = ltc->snode; |