From: Takashi Sakamoto Date: Fri, 20 Nov 2020 05:19:44 +0000 (+0900) Subject: hwdep: conditional build for Linux kernel v4.9 or later X-Git-Tag: v0.2.0~5 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=45f650bf29e8d0128f4e067cdefea62d2fb02d16;p=alsa-gobject.git hwdep: conditional build for Linux kernel v4.9 or later The type of interface in ALSA HwDep interface got a new entry in Linux kernel v4.9. This commit adds conditional macro to build for Linux kernel v4.9 or later. Signed-off-by: Takashi Sakamoto --- diff --git a/src/hwdep/alsahwdep-enum-types.h b/src/hwdep/alsahwdep-enum-types.h index 997d47f..20b812d 100644 --- a/src/hwdep/alsahwdep-enum-types.h +++ b/src/hwdep/alsahwdep-enum-types.h @@ -3,6 +3,7 @@ #define __ALSA_GOBJECT_ALSAHWDEP_ENUM_TYPES__H__ #include +#include /** *ALSAHwdepIfaceType: @@ -30,7 +31,7 @@ * @ALSAHWDEP_IFACE_TYPE_FW_OXFW: For Oxford OXFW970/971 based devices. * @ALSAHWDEP_IFACE_TYPE_FW_DIGI00X: For Digidesign Digi 002/003 family. * @ALSAHWDEP_IFACE_TYPE_FW_TASCAM: For TASCAM FireWire series. - * @ALSAHWDEP_IFACE_TYPE_LINE6: For Line6 USB processors. + * @ALSAHWDEP_IFACE_TYPE_LINE6: For Line6 USB processors. Available in Linux kernel 4.9.0 or later. * @ALSAHWDEP_IFACE_TYPE_FW_MOTU: For MOTU FireWire series. * @ALSAHWDEP_IFACE_TYPE_FW_FIREFACE: For RME Fireface series. * @@ -61,7 +62,11 @@ typedef enum { ALSAHWDEP_IFACE_TYPE_FW_OXFW = SNDRV_HWDEP_IFACE_FW_OXFW, ALSAHWDEP_IFACE_TYPE_FW_DIGI00X = SNDRV_HWDEP_IFACE_FW_DIGI00X, ALSAHWDEP_IFACE_TYPE_FW_TASCAM = SNDRV_HWDEP_IFACE_FW_TASCAM, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ALSAHWDEP_IFACE_TYPE_LINE6 = SNDRV_HWDEP_IFACE_LINE6, +#else + ALSAHWDEP_IFACE_TYPE_LINE6, +#endif ALSAHWDEP_IFACE_TYPE_FW_MOTU = SNDRV_HWDEP_IFACE_FW_MOTU, ALSAHWDEP_IFACE_TYPE_FW_FIREFACE = SNDRV_HWDEP_IFACE_FW_FIREFACE, } ALSAHwdepIfaceType;