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/pci200syn.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/pci200syn.c')
| -rw-r--r-- | drivers/net/wan/pci200syn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c index e2cff64a446a..fd7375955e41 100644 --- a/drivers/net/wan/pci200syn.c +++ b/drivers/net/wan/pci200syn.c | |||
| @@ -220,7 +220,7 @@ static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 220 | new_line.clock_type != CLOCK_TXFROMRX && | 220 | new_line.clock_type != CLOCK_TXFROMRX && |
| 221 | new_line.clock_type != CLOCK_INT && | 221 | new_line.clock_type != CLOCK_INT && |
| 222 | new_line.clock_type != CLOCK_TXINT) | 222 | new_line.clock_type != CLOCK_TXINT) |
| 223 | return -EINVAL; /* No such clock setting */ | 223 | return -EINVAL; /* No such clock setting */ |
| 224 | 224 | ||
| 225 | if (new_line.loopback != 0 && new_line.loopback != 1) | 225 | if (new_line.loopback != 0 && new_line.loopback != 1) |
| 226 | return -EINVAL; | 226 | return -EINVAL; |