Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192693
b: refs/heads/master
c: 576d573
h: refs/heads/master
i:
  192691: 5c06236
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed May 18, 2010
1 parent ef2bdd7 commit 9a2b079
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6ad6e88a156e131597c8636456d4d84f7987808a
refs/heads/master: 576d5739a44af5fcbacfe504a8d989a5c7ea8fc7
12 changes: 2 additions & 10 deletions trunk/drivers/staging/tm6000/tm6000-alsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,20 +333,11 @@ static int __devinit snd_tm6000_pcm(struct snd_tm6000_card *chip,
Basic Flow for Sound Devices
****************************************************************************/


/*
* Component Destructor
*/
static void snd_tm6000_dev_free(struct snd_card *card)
{
}


/*
* Alsa Constructor - Component probe
*/

static int tm6000_audio_init(struct tm6000_core *dev, int idx)
int tm6000_audio_init(struct tm6000_core *dev, int idx)
{
struct snd_card *card;
struct snd_tm6000_card *chip;
Expand Down Expand Up @@ -419,4 +410,5 @@ static int tm6000_audio_init(struct tm6000_core *dev, int idx)
snd_card_free(card);
return rc;
}
EXPORT_SYMBOL_GPL(tm6000_audio_init);

4 changes: 4 additions & 0 deletions trunk/drivers/staging/tm6000/tm6000.h
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,10 @@ unsigned int tm6000_v4l2_poll(struct file *file,
struct poll_table_struct *wait);
int tm6000_queue_init(struct tm6000_core *dev);

/* In tm6000-alsa.c */
int tm6000_audio_init(struct tm6000_core *dev, int idx);


/* Debug stuff */

extern int tm6000_debug;
Expand Down

0 comments on commit 9a2b079

Please sign in to comment.