diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 17:22:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 17:22:04 -0800 |
| commit | 97c440ba41d4e7cddb8e14c7c7ec49dad2560709 (patch) | |
| tree | 8fc62e3c3a17d22613d0d6d2a4ecebc8fd19edee /drivers/media/dvb/frontends/stb0899_algo.c | |
| parent | 713404d6082fee34a829a0c6d511e4aec72d7654 (diff) | |
| parent | 661263b55d56365af911049f8824d3bf1a7aea85 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (10191a): Update MAINTAINERS entries on media drivers
V4L/DVB (10190): cx88: Fix some Kbuild troubles
V4L/DVB (10189): dm1105: Fix build with INPUT=m and DVB_DM1105=y
V4L/DVB (10185): Use negated usb_endpoint_xfer_control, etc
V4L/DVB (10182): tda8290: fix TDA8290 + TDA18271 initialization
V4L/DVB (10181): v4l2-device: Fix some sparse warnings
V4L/DVB (10180): drivers/media: Fix a number of sparse warnings
V4L/DVB (10179): tda8290: Fix two sparse warnings
V4L/DVB (10178): dvb_frontend: Fix some sparse warnings due to static symbols
V4L/DVB (10177): Fix sparse warnings on em28xx
V4L/DVB (10176b): pxa-camera: fix redefinition warnings and missing DMA definitions
V4L/DVB (10176a): Switch remaining clear_user_page users over to clear_user_highpage
Diffstat (limited to 'drivers/media/dvb/frontends/stb0899_algo.c')
| -rw-r--r-- | drivers/media/dvb/frontends/stb0899_algo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c index ced9b7ae7d5..83dc7e12d5f 100644 --- a/drivers/media/dvb/frontends/stb0899_algo.c +++ b/drivers/media/dvb/frontends/stb0899_algo.c @@ -54,7 +54,7 @@ static u32 stb0899_calc_srate(u32 master_clk, u8 *sfr) * stb0899_get_srate * Get the current symbol rate */ -u32 stb0899_get_srate(struct stb0899_state *state) +static u32 stb0899_get_srate(struct stb0899_state *state) { struct stb0899_internal *internal = &state->internal; u8 sfr[3]; @@ -763,7 +763,7 @@ static void stb0899_dvbs2_config_csm_auto(struct stb0899_state *state) stb0899_write_s2reg(state, STB0899_S2DEMOD, STB0899_BASE_CSM_CNTRL1, STB0899_OFF0_CSM_CNTRL1, reg); } -long Log2Int(int number) +static long Log2Int(int number) { int i; |