diff options
author | 2011-07-22 08:43:24 +0200 | |
---|---|---|
committer | 2011-07-22 08:43:24 +0200 | |
commit | 7d339ae99758bc21033d4a19bcd4f7b55f96e24e (patch) | |
tree | a5bb46e47f7c4ae193cdf1a73c361144d6099df8 /sound/pci/lx6464es/lx_core.h | |
parent | Merge branch 'topic/asoc' into for-linus (diff) | |
parent | ALSA: asihpi - Replace with snd_ctl_boolean_mono_info() (diff) | |
download | linux-dev-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.tar.xz linux-dev-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/lx6464es/lx_core.h')
-rw-r--r-- | sound/pci/lx6464es/lx_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/lx6464es/lx_core.h b/sound/pci/lx6464es/lx_core.h index 6bd9cbbbc68d..1dd562980b6c 100644 --- a/sound/pci/lx6464es/lx_core.h +++ b/sound/pci/lx6464es/lx_core.h @@ -116,7 +116,7 @@ int __devinit lx_dsp_get_version(struct lx6464es *chip, u32 *rdsp_version); int lx_dsp_get_clock_frequency(struct lx6464es *chip, u32 *rfreq); int lx_dsp_set_granularity(struct lx6464es *chip, u32 gran); int lx_dsp_read_async_events(struct lx6464es *chip, u32 *data); -int lx_dsp_get_mac(struct lx6464es *chip, u8 *mac_address); +int lx_dsp_get_mac(struct lx6464es *chip); /* low-level pipe handling */ |