diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-20 15:38:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-20 15:38:45 +0200 |
| commit | 011968d0956aa09db5ae2ebe9601643d8d43957e (patch) | |
| tree | ae46092b9228795112f38b0ea8269f95d3a1dbbf | |
| parent | 4dfe53cdc4b8a889ac0d524d4d8743c58ef413b1 (diff) | |
| parent | 10a68af6c4c2800a25733534802a3a576594343f (diff) | |
| download | alsa-driver-build-unstable-011968d0956aa09db5ae2ebe9601643d8d43957e.tar.gz | |
Merge branch 'test/hdmi-merge' of ../alsa-driver-build-unstable
| -rw-r--r-- | pci/hda/patch_atihdmi.c | 3 | ||||
| -rw-r--r-- | pci/hda/patch_hdmi.c | 3 | ||||
| -rw-r--r-- | pci/hda/patch_intelhdmi.c | 3 | ||||
| -rw-r--r-- | pci/hda/patch_nvhdmi.c | 3 |
4 files changed, 3 insertions, 9 deletions
diff --git a/pci/hda/patch_atihdmi.c b/pci/hda/patch_atihdmi.c deleted file mode 100644 index 5628a1b7d..000000000 --- a/pci/hda/patch_atihdmi.c +++ /dev/null @@ -1,3 +0,0 @@ -#define __NO_VERSION__ -#include "adriver.h" -#include "../../alsa-kernel/pci/hda/patch_atihdmi.c" diff --git a/pci/hda/patch_hdmi.c b/pci/hda/patch_hdmi.c new file mode 100644 index 000000000..68d42a7b0 --- /dev/null +++ b/pci/hda/patch_hdmi.c @@ -0,0 +1,3 @@ +#define __NO_VERSION__ +#include "adriver.h" +#include "../../alsa-kernel/pci/hda/patch_hdmi.c" diff --git a/pci/hda/patch_intelhdmi.c b/pci/hda/patch_intelhdmi.c deleted file mode 100644 index 027e57a78..000000000 --- a/pci/hda/patch_intelhdmi.c +++ /dev/null @@ -1,3 +0,0 @@ -#define __NO_VERSION__ -#include "adriver.h" -#include "../../alsa-kernel/pci/hda/patch_intelhdmi.c" diff --git a/pci/hda/patch_nvhdmi.c b/pci/hda/patch_nvhdmi.c deleted file mode 100644 index 3e700fdb7..000000000 --- a/pci/hda/patch_nvhdmi.c +++ /dev/null @@ -1,3 +0,0 @@ -#define __NO_VERSION__ -#include "adriver.h" -#include "../../alsa-kernel/pci/hda/patch_nvhdmi.c" |