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/pppox.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/pppox.c')
| -rw-r--r-- | drivers/net/pppox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c index d4191ef9cad1..8c0d170dabcd 100644 --- a/drivers/net/pppox.c +++ b/drivers/net/pppox.c | |||
| @@ -36,9 +36,9 @@ | |||
| 36 | 36 | ||
| 37 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
| 38 | 38 | ||
| 39 | static struct pppox_proto *pppox_protos[PX_MAX_PROTO + 1]; | 39 | static const struct pppox_proto *pppox_protos[PX_MAX_PROTO + 1]; |
| 40 | 40 | ||
| 41 | int register_pppox_proto(int proto_num, struct pppox_proto *pp) | 41 | int register_pppox_proto(int proto_num, const struct pppox_proto *pp) |
| 42 | { | 42 | { |
| 43 | if (proto_num < 0 || proto_num > PX_MAX_PROTO) | 43 | if (proto_num < 0 || proto_num > PX_MAX_PROTO) |
| 44 | return -EINVAL; | 44 | return -EINVAL; |