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/media/dvb/frontends/mt352.h | |
| 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/media/dvb/frontends/mt352.h')
| -rw-r--r-- | drivers/media/dvb/frontends/mt352.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/mt352.h b/drivers/media/dvb/frontends/mt352.h index 595092f9f0c4..ca2562d6f289 100644 --- a/drivers/media/dvb/frontends/mt352.h +++ b/drivers/media/dvb/frontends/mt352.h | |||
| @@ -63,7 +63,7 @@ static inline struct dvb_frontend* mt352_attach(const struct mt352_config* confi | |||
| 63 | } | 63 | } |
| 64 | #endif // CONFIG_DVB_MT352 | 64 | #endif // CONFIG_DVB_MT352 |
| 65 | 65 | ||
| 66 | static inline int mt352_write(struct dvb_frontend *fe, u8 *buf, int len) { | 66 | static inline int mt352_write(struct dvb_frontend *fe, const u8 buf[], int len) { |
| 67 | int r = 0; | 67 | int r = 0; |
| 68 | if (fe->ops.write) | 68 | if (fe->ops.write) |
| 69 | r = fe->ops.write(fe, buf, len); | 69 | r = fe->ops.write(fe, buf, len); |