Commit 2125e971 authored by Jaroslav Kysela's avatar Jaroslav Kysela

ALSA update

  - moved inclusion of <linux/interrupt.h> from <sound/asound.h> to <sound/timer.h>
  - pmac driver - removed beep stuff for 2.5 kernels
  - USB driver - fixed compilation
parent 28a59cb0
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/time.h> #include <linux/time.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/interrupt.h>
#if __LITTLE_ENDIAN == 1234 #if __LITTLE_ENDIAN == 1234
#define SNDRV_LITTLE_ENDIAN #define SNDRV_LITTLE_ENDIAN
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#include <sound/asound.h> #include <sound/asound.h>
#include <linux/interrupt.h>
typedef enum sndrv_timer_class snd_timer_class_t; typedef enum sndrv_timer_class snd_timer_class_t;
typedef enum sndrv_timer_slave_class snd_timer_slave_class_t; typedef enum sndrv_timer_slave_class snd_timer_slave_class_t;
......
/* include/version.h. Generated by configure. */ /* include/version.h. Generated by configure. */
#define CONFIG_SND_VERSION "0.9.0rc7" #define CONFIG_SND_VERSION "0.9.0rc7"
#define CONFIG_SND_DATE " (Sat Feb 08 17:33:25 2003 UTC)" #define CONFIG_SND_DATE " (Sun Feb 09 18:00:12 2003 UTC)"
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h>
#include <sound/core.h> #include <sound/core.h>
#include "pmac.h" #include "pmac.h"
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
...@@ -695,6 +696,7 @@ int __init snd_pmac_pcm_new(pmac_t *chip) ...@@ -695,6 +696,7 @@ int __init snd_pmac_pcm_new(pmac_t *chip)
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
/* /*
* beep stuff * beep stuff
...@@ -931,6 +933,8 @@ int __init snd_pmac_attach_beep(pmac_t *chip) ...@@ -931,6 +933,8 @@ int __init snd_pmac_attach_beep(pmac_t *chip)
return 0; return 0;
} }
#endif /* beep stuff */
static void snd_pmac_dbdma_reset(pmac_t *chip) static void snd_pmac_dbdma_reset(pmac_t *chip)
{ {
out_le32(&chip->playback.dma->control, (RUN|PAUSE|FLUSH|WAKE|DEAD) << 16); out_le32(&chip->playback.dma->control, (RUN|PAUSE|FLUSH|WAKE|DEAD) << 16);
......
...@@ -129,8 +129,10 @@ static int __init snd_pmac_probe(void) ...@@ -129,8 +129,10 @@ static int __init snd_pmac_probe(void)
goto __error; goto __error;
chip->initialized = 1; chip->initialized = 1;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
if (enable_beep) if (enable_beep)
snd_pmac_attach_beep(chip); snd_pmac_attach_beep(chip);
#endif
if ((err = snd_card_register(card)) < 0) if ((err = snd_card_register(card)) < 0)
goto __error; goto __error;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/i2c-dev.h> #include <linux/i2c-dev.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h>
#include <sound/core.h> #include <sound/core.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
......
...@@ -2216,12 +2216,12 @@ static int create_composite_quirk(snd_usb_audio_t *chip, ...@@ -2216,12 +2216,12 @@ static int create_composite_quirk(snd_usb_audio_t *chip,
struct usb_interface *iface, struct usb_interface *iface,
const snd_usb_audio_quirk_t *quirk) const snd_usb_audio_quirk_t *quirk)
{ {
struct usb_config_descriptor *config = chip->dev->actconfig; struct usb_host_config *config = chip->dev->actconfig;
int probed_ifnum = get_iface_desc(iface->altsetting)->bInterfaceNumber; int probed_ifnum = get_iface_desc(iface->altsetting)->bInterfaceNumber;
int err; int err;
for (quirk = quirk->data; quirk->ifnum >= 0; ++quirk) { for (quirk = quirk->data; quirk->ifnum >= 0; ++quirk) {
if (quirk->ifnum >= config->bNumInterfaces) if (quirk->ifnum >= get_cfg_desc(config)->bNumInterfaces)
continue; continue;
iface = &config->interface[quirk->ifnum]; iface = &config->interface[quirk->ifnum];
if (quirk->ifnum != probed_ifnum && if (quirk->ifnum != probed_ifnum &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment