diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-05-29 15:50:33 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-05-29 15:50:33 -0400 |
commit | a98d3984c85222aa9efc63c4f9dd3d805ce469f2 (patch) | |
tree | aeb9ebdcc06ca92b8114f30cedf16b8f3780b3f2 /sound/pci/asihpi/hpi.h | |
parent | 52593de4c11fb24c83d8036ba34706881aab5e3d (diff) | |
parent | 55567ab70bd8551c73253e44ea5244db41eac81b (diff) |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/pci/asihpi/hpi.h')
-rw-r--r-- | sound/pci/asihpi/hpi.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h index 99400de6c075..0173bbe62b67 100644 --- a/sound/pci/asihpi/hpi.h +++ b/sound/pci/asihpi/hpi.h | |||
@@ -50,7 +50,7 @@ i.e 3.05.02 is a development version | |||
50 | #define HPI_VER_RELEASE(v) ((int)(v & 0xFF)) | 50 | #define HPI_VER_RELEASE(v) ((int)(v & 0xFF)) |
51 | 51 | ||
52 | /* Use single digits for versions less that 10 to avoid octal. */ | 52 | /* Use single digits for versions less that 10 to avoid octal. */ |
53 | #define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 3, 18) | 53 | #define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 3, 25) |
54 | 54 | ||
55 | /* Library version as documented in hpi-api-versions.txt */ | 55 | /* Library version as documented in hpi-api-versions.txt */ |
56 | #define HPI_LIB_VER HPI_VERSION_CONSTRUCTOR(9, 0, 0) | 56 | #define HPI_LIB_VER HPI_VERSION_CONSTRUCTOR(9, 0, 0) |
@@ -1632,6 +1632,12 @@ u16 hpi_tuner_get_hd_radio_sdk_version(const struct hpi_hsubsys *ph_subsys, | |||
1632 | u16 hpi_tuner_get_hd_radio_signal_quality(const struct hpi_hsubsys *ph_subsys, | 1632 | u16 hpi_tuner_get_hd_radio_signal_quality(const struct hpi_hsubsys *ph_subsys, |
1633 | u32 h_control, u32 *pquality); | 1633 | u32 h_control, u32 *pquality); |
1634 | 1634 | ||
1635 | u16 hpi_tuner_get_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys, | ||
1636 | u32 h_control, u32 *pblend); | ||
1637 | |||
1638 | u16 hpi_tuner_set_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys, | ||
1639 | u32 h_control, const u32 blend); | ||
1640 | |||
1635 | /****************************/ | 1641 | /****************************/ |
1636 | /* PADs control */ | 1642 | /* PADs control */ |
1637 | /****************************/ | 1643 | /****************************/ |