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/wan/hdlc.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/wan/hdlc.c')
| -rw-r--r-- | drivers/net/wan/hdlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c index 9937bbab938d..5d4bb615ccce 100644 --- a/drivers/net/wan/hdlc.c +++ b/drivers/net/wan/hdlc.c | |||
| @@ -109,7 +109,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event, | |||
| 109 | return NOTIFY_DONE; /* not an HDLC device */ | 109 | return NOTIFY_DONE; /* not an HDLC device */ |
| 110 | 110 | ||
| 111 | if (event != NETDEV_CHANGE) | 111 | if (event != NETDEV_CHANGE) |
| 112 | return NOTIFY_DONE; /* Only interrested in carrier changes */ | 112 | return NOTIFY_DONE; /* Only interested in carrier changes */ |
| 113 | 113 | ||
| 114 | on = netif_carrier_ok(dev); | 114 | on = netif_carrier_ok(dev); |
| 115 | 115 | ||