diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 13:45:43 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 13:45:43 -0600 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /sound/pci/als300.c | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
| download | op-kernel-dev-81b7bbd1932a04869d4c8635a75222dfc6089f96.zip op-kernel-dev-81b7bbd1932a04869d4c8635a75222dfc6089f96.tar.gz | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'sound/pci/als300.c')
| -rw-r--r-- | sound/pci/als300.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/als300.c b/sound/pci/als300.c index 9f406fb..8afcb98 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c @@ -444,7 +444,7 @@ static int snd_als300_capture_close(struct snd_pcm_substream *substream) } static int snd_als300_pcm_hw_params(struct snd_pcm_substream *substream, - snd_pcm_hw_params_t * hw_params) + struct snd_pcm_hw_params *hw_params) { return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)); @@ -673,7 +673,7 @@ static void snd_als300_init(struct snd_als300 *chip) snd_als300_dbgcallleave(); } -static int __devinit snd_als300_create(snd_card_t *card, +static int __devinit snd_als300_create(struct snd_card *card, struct pci_dev *pci, int chip_type, struct snd_als300 **rchip) { @@ -681,7 +681,7 @@ static int __devinit snd_als300_create(snd_card_t *card, void *irq_handler; int err; - static snd_device_ops_t ops = { + static struct snd_device_ops ops = { .dev_free = snd_als300_dev_free, }; *rchip = NULL; |
