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/c101.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/c101.c')
| -rw-r--r-- | drivers/net/wan/c101.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c index 0bd898c94759..4ac85a09c5a6 100644 --- a/drivers/net/wan/c101.c +++ b/drivers/net/wan/c101.c | |||
| @@ -264,7 +264,7 @@ static int c101_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 264 | new_line.clock_type != CLOCK_TXFROMRX && | 264 | new_line.clock_type != CLOCK_TXFROMRX && |
| 265 | new_line.clock_type != CLOCK_INT && | 265 | new_line.clock_type != CLOCK_INT && |
| 266 | new_line.clock_type != CLOCK_TXINT) | 266 | new_line.clock_type != CLOCK_TXINT) |
| 267 | return -EINVAL; /* No such clock setting */ | 267 | return -EINVAL; /* No such clock setting */ |
| 268 | 268 | ||
| 269 | if (new_line.loopback != 0 && new_line.loopback != 1) | 269 | if (new_line.loopback != 0 && new_line.loopback != 1) |
| 270 | return -EINVAL; | 270 | return -EINVAL; |