diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-03 16:18:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:55:44 -0400 |
commit | b01fbc10e3c789763b2c953984bc4b80f59bcdf3 (patch) | |
tree | 9e02b59f145de94bc8227d22f6ca2ed12594bb30 | |
parent | 36e3fc8957abffa3218a6e3b61bef335eea80c03 (diff) |
[media] drxd/drxk: Don't export MulDiv32 symbol
/home/v4l/v4l/patchwork/drivers/media/dvb/frontends/drxk_hard.c:181: multiple definition of `MulDiv32'
drivers/media/dvb/frontends/drxd.o:/home/v4l/v4l/patchwork/drivers/media/dvb/frontends/drxd_hard.c:236: first defined here
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/frontends/drxd_hard.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/drxk_hard.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/drxd_hard.c b/drivers/media/dvb/frontends/drxd_hard.c index f132e49e48e6..d7afa3493f1e 100644 --- a/drivers/media/dvb/frontends/drxd_hard.c +++ b/drivers/media/dvb/frontends/drxd_hard.c | |||
@@ -232,7 +232,7 @@ static int i2c_read(struct i2c_adapter *adap, | |||
232 | return 0; | 232 | return 0; |
233 | } | 233 | } |
234 | 234 | ||
235 | inline u32 MulDiv32(u32 a, u32 b, u32 c) | 235 | static inline u32 MulDiv32(u32 a, u32 b, u32 c) |
236 | { | 236 | { |
237 | u64 tmp64; | 237 | u64 tmp64; |
238 | 238 | ||
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c index fbe24b6d70c7..5ac5e7653cba 100644 --- a/drivers/media/dvb/frontends/drxk_hard.c +++ b/drivers/media/dvb/frontends/drxk_hard.c | |||
@@ -177,7 +177,7 @@ bool IsA1WithRomCode(struct drxk_state *state) | |||
177 | #define DRXK_QAM_SL_SIG_POWER_QAM128 (20992) | 177 | #define DRXK_QAM_SL_SIG_POWER_QAM128 (20992) |
178 | #define DRXK_QAM_SL_SIG_POWER_QAM256 (43520) | 178 | #define DRXK_QAM_SL_SIG_POWER_QAM256 (43520) |
179 | 179 | ||
180 | inline u32 MulDiv32(u32 a, u32 b, u32 c) | 180 | static inline u32 MulDiv32(u32 a, u32 b, u32 c) |
181 | { | 181 | { |
182 | u64 tmp64; | 182 | u64 tmp64; |
183 | 183 | ||