projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[firefly-linux-kernel-4.4.55.git]
/
include
/
sound
/
vx_core.h
diff --git
a/include/sound/vx_core.h
b/include/sound/vx_core.h
index 9821a6194caae33ebb72dabe803a83a0b6b91e15..4830651cc4cffd5dfafc1c29c5d5fd00c905ecac 100644
(file)
--- a/
include/sound/vx_core.h
+++ b/
include/sound/vx_core.h
@@
-128,6
+128,7
@@
struct snd_vx_hardware {
unsigned int num_ins;
unsigned int num_outs;
unsigned int output_level_max;
unsigned int num_ins;
unsigned int num_outs;
unsigned int output_level_max;
+ const unsigned int *output_level_db_scale;
};
/* hwdep id string */
};
/* hwdep id string */
@@
-227,7
+228,7
@@
void snd_vx_free_firmware(struct vx_core *chip);
/*
* interrupt handler; exported for pcmcia
*/
/*
* interrupt handler; exported for pcmcia
*/
-irqreturn_t snd_vx_irq_handler(int irq, void *dev
, struct pt_regs *regs
);
+irqreturn_t snd_vx_irq_handler(int irq, void *dev);
/*
* lowlevel functions
/*
* lowlevel functions