diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-07 09:57:57 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 09:57:57 +0100 |
| commit | 141f762c18d560afba96b0f97d84acac90dc7bdf (patch) | |
| tree | a42de80ec8b7b48677f39b8e5d63652908fe14c5 | |
| parent | 4e525672f093cc9f7b106de42e8b2794bfc66c37 (diff) | |
| download | alsa-driver-build-old-master.tar.gz | |
Refreshed pci/hda/hda_intel.patch and usb/caiaq/device.patchold-master
Both got broken due to __dev* prefix removals in the upstream.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | pci/hda/hda_intel.patch | 26 | ||||
| -rw-r--r-- | usb/caiaq/device.patch | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/pci/hda/hda_intel.patch b/pci/hda/hda_intel.patch index 0601ac913..e974de6c3 100644 --- a/pci/hda/hda_intel.patch +++ b/pci/hda/hda_intel.patch @@ -1,5 +1,5 @@ ---- ../../alsa-kernel/pci/hda/hda_intel.c 2012-11-22 17:40:53.000000000 +0100 -+++ hda_intel.c 2012-11-27 10:01:49.000000000 +0100 +--- ../../alsa-kernel/pci/hda/hda_intel.c 2012-12-07 07:55:19.000000000 +0100 ++++ hda_intel.c 2012-12-07 08:50:44.000000000 +0100 @@ -1,3 +1,4 @@ +#include "hda_intel_hack.c" /* @@ -13,9 +13,9 @@ #include <linux/clocksource.h> +#endif #include <linux/time.h> + #include <linux/completion.h> - #ifdef CONFIG_X86 -@@ -423,8 +426,10 @@ +@@ -424,8 +427,10 @@ unsigned int wc_marked:1; unsigned int no_period_wakeup:1; @@ -26,7 +26,7 @@ }; /* CORB/RIRB */ -@@ -665,10 +670,21 @@ +@@ -659,10 +664,21 @@ return; if (addr && size) { int pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; @@ -48,7 +48,7 @@ } } -@@ -1764,6 +1780,7 @@ +@@ -1759,6 +1775,7 @@ azx_dev->opened = 0; } @@ -56,7 +56,7 @@ static cycle_t azx_cc_read(const struct cyclecounter *cc) { struct azx_dev *azx_dev = container_of(cc, struct azx_dev, azx_cc); -@@ -1821,6 +1838,9 @@ +@@ -1816,6 +1833,9 @@ return 0; } @@ -66,7 +66,7 @@ static struct snd_pcm_hardware azx_pcm_hw = { .info = (SNDRV_PCM_INFO_MMAP | -@@ -2161,6 +2181,7 @@ +@@ -2156,6 +2176,7 @@ azx_readl(chip, OLD_SSYNC) & ~sbits); else azx_writel(chip, SSYNC, azx_readl(chip, SSYNC) & ~sbits); @@ -74,7 +74,7 @@ if (start) { azx_timecounter_init(substream, 0, 0); if (nsync > 1) { -@@ -2177,6 +2198,7 @@ +@@ -2172,6 +2193,7 @@ } } } @@ -82,7 +82,7 @@ spin_unlock(&chip->reg_lock); return 0; } -@@ -2399,7 +2421,11 @@ +@@ -2394,7 +2416,11 @@ struct azx_pcm *apcm = snd_pcm_substream_chip(substream); struct azx *chip = apcm->chip; if (!azx_snoop(chip)) @@ -95,7 +95,7 @@ } #else @@ -2935,6 +2961,7 @@ - static bool __devinit check_hdmi_disabled(struct pci_dev *pci) + static bool check_hdmi_disabled(struct pci_dev *pci) { bool vga_inactive = false; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) @@ -133,7 +133,7 @@ +}; +#endif + - static void __devinit check_msi(struct azx *chip) + static void check_msi(struct azx *chip) { const struct snd_pci_quirk *q; @@ -3070,7 +3110,11 @@ @@ -174,7 +174,7 @@ snoop = false; } break; -@@ -3264,7 +3318,7 @@ +@@ -3246,7 +3300,7 @@ PCI_DEVICE_ID_ATI_SBX00_SMBUS, NULL); if (p_smbus) { diff --git a/usb/caiaq/device.patch b/usb/caiaq/device.patch index 2a5cae723..fcfd255cc 100644 --- a/usb/caiaq/device.patch +++ b/usb/caiaq/device.patch @@ -1,5 +1,5 @@ ---- ../../alsa-kernel/usb/caiaq/device.c 2011-10-19 17:32:45.314228109 +0200 -+++ device.c 2011-11-08 08:38:43.436915004 +0100 +--- ../../alsa-kernel/usb/caiaq/device.c 2012-12-07 07:55:19.000000000 +0100 ++++ device.c 2012-12-07 08:52:39.000000000 +0100 @@ -1,3 +1,5 @@ +#include "adriver.h" +#include "../usbcompat.h" @@ -32,6 +32,6 @@ +#define snd_usb_caiaq_midi_output_done snd_usb_caiaq_midi_output_done_wrapper +#endif + - static int __devinit init_card(struct snd_usb_caiaqdev *dev) + static int init_card(struct snd_usb_caiaqdev *dev) { char *c, usbpath[32]; |