diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /drivers/media/video/bttv-driver.c | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'drivers/media/video/bttv-driver.c')
| -rw-r--r-- | drivers/media/video/bttv-driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index c13f222fe6bd..033cc5498f23 100644 --- a/drivers/media/video/bttv-driver.c +++ b/drivers/media/video/bttv-driver.c | |||
| @@ -3169,7 +3169,7 @@ static struct video_device radio_template = | |||
| 3169 | /* ----------------------------------------------------------------------- */ | 3169 | /* ----------------------------------------------------------------------- */ |
| 3170 | /* some debug code */ | 3170 | /* some debug code */ |
| 3171 | 3171 | ||
| 3172 | int bttv_risc_decode(u32 risc) | 3172 | static int bttv_risc_decode(u32 risc) |
| 3173 | { | 3173 | { |
| 3174 | static char *instr[16] = { | 3174 | static char *instr[16] = { |
| 3175 | [ BT848_RISC_WRITE >> 28 ] = "write", | 3175 | [ BT848_RISC_WRITE >> 28 ] = "write", |
| @@ -3206,8 +3206,8 @@ int bttv_risc_decode(u32 risc) | |||
| 3206 | return incr[risc >> 28] ? incr[risc >> 28] : 1; | 3206 | return incr[risc >> 28] ? incr[risc >> 28] : 1; |
| 3207 | } | 3207 | } |
| 3208 | 3208 | ||
| 3209 | void bttv_risc_disasm(struct bttv *btv, | 3209 | static void bttv_risc_disasm(struct bttv *btv, |
| 3210 | struct btcx_riscmem *risc) | 3210 | struct btcx_riscmem *risc) |
| 3211 | { | 3211 | { |
| 3212 | unsigned int i,j,n; | 3212 | unsigned int i,j,n; |
| 3213 | 3213 | ||