• Vinod Koul's avatar
    ASoC: Intel: Kconfig: fix build when ACPI is not enabled · 3493d4a8
    Vinod Koul authored
    Randy reported following error when ACPI is not enabled:
    
    warning: (SND_SOC_INTEL_BYTCR_RT5640_MACH && SND_SOC_INTEL_BYTCR_RT5651_MACH
    && SND_SOC_INTEL_CHT_BSW_RT5672_MACH && SND_SOC_INTEL_CHT_BSW_RT5645_MACH &&
    SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) selects SND_SST_IPC_ACPI
    +which has unmet direct dependencies (SOUND && !M68K && !UML && SND &&
    SND_SOC && ACPI)
    
    causing these build errors:
    
    In file included from ../sound/soc/intel/atom/sst/sst_acpi.c:40:0:
    ../include/acpi/acpi_bus.h:65:20: error: conflicting types for
    'acpi_evaluate_dsm'
     union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid,
    In file included from ../sound/soc/intel/atom/sst/sst_acpi.c:31:0:
    ../include/linux/acpi.h:676:34: note: previous definition of
    'acpi_evaluate_dsm' was here
     static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle,
    
    CONFIG_SND_SST_IPC_ACPI was already dependent upon ACPI, but that was not
    solving it. So move the depends up to machine drivers and remove from
    CONFIG_SND_SST_IPC_ACPI.
    Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
    Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
    Signed-off-by: default avatarMark Brown <broonie@kernel.org>
    3493d4a8
Kconfig 7.57 KB