Commit 56e91b12 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'hda-codec-h-move' of... 

Merge tag 'hda-codec-h-move' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ALSA: Move hda_codec.h to include/sound

For easier sharing with ASoC.
parents 3a182c84 be57bfff

sound/pci/hda/hda_codec.h→include/sound/hda_codec.h

+0 −0

File moved.

View file

sound/pci/hda/hda_auto_parser.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/export.h>

#include <linux/sort.h>

#include <sound/core.h>

#include "hda_codec.h"

#include <sound/hda_codec.h>

#include "hda_local.h"

#include "hda_auto_parser.h"

sound/pci/hda/hda_beep.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#ifndef __SOUND_HDA_BEEP_H

#define __SOUND_HDA_BEEP_H



#include "hda_codec.h"

#include <sound/hda_codec.h>



#define HDA_BEEP_MODE_OFF	0

#define HDA_BEEP_MODE_ON	1

sound/pci/hda/hda_bind.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <sound/core.h>

#include "hda_codec.h"

#include <sound/hda_codec.h>

#include "hda_local.h"



/*

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <sound/core.h>

#include "hda_codec.h"

#include <sound/hda_codec.h>

#include <sound/asoundef.h>

#include <sound/tlv.h>

#include <sound/initval.h>