diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /include/sound/initval.h | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'include/sound/initval.h')
-rw-r--r-- | include/sound/initval.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/sound/initval.h b/include/sound/initval.h index ac62c67e6f4..1daa6dff829 100644 --- a/include/sound/initval.h +++ b/include/sound/initval.h | |||
@@ -50,20 +50,6 @@ | |||
50 | #define SNDRV_DEFAULT_DMA_SIZE { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE } | 50 | #define SNDRV_DEFAULT_DMA_SIZE { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE } |
51 | #define SNDRV_DEFAULT_PTR SNDRV_DEFAULT_STR | 51 | #define SNDRV_DEFAULT_PTR SNDRV_DEFAULT_STR |
52 | 52 | ||
53 | #ifdef SNDRV_LEGACY_FIND_FREE_IOPORT | ||
54 | static long snd_legacy_find_free_ioport(long *port_table, long size) | ||
55 | { | ||
56 | while (*port_table != -1) { | ||
57 | if (request_region(*port_table, size, "ALSA test")) { | ||
58 | release_region(*port_table, size); | ||
59 | return *port_table; | ||
60 | } | ||
61 | port_table++; | ||
62 | } | ||
63 | return -1; | ||
64 | } | ||
65 | #endif | ||
66 | |||
67 | #ifdef SNDRV_LEGACY_FIND_FREE_IRQ | 53 | #ifdef SNDRV_LEGACY_FIND_FREE_IRQ |
68 | #include <linux/interrupt.h> | 54 | #include <linux/interrupt.h> |
69 | 55 | ||
@@ -76,7 +62,7 @@ static int snd_legacy_find_free_irq(int *irq_table) | |||
76 | { | 62 | { |
77 | while (*irq_table != -1) { | 63 | while (*irq_table != -1) { |
78 | if (!request_irq(*irq_table, snd_legacy_empty_irq_handler, | 64 | if (!request_irq(*irq_table, snd_legacy_empty_irq_handler, |
79 | IRQF_PROBE_SHARED, "ALSA Test IRQ", | 65 | IRQF_DISABLED | IRQF_PROBE_SHARED, "ALSA Test IRQ", |
80 | (void *) irq_table)) { | 66 | (void *) irq_table)) { |
81 | free_irq(*irq_table, (void *) irq_table); | 67 | free_irq(*irq_table, (void *) irq_table); |
82 | return *irq_table; | 68 | return *irq_table; |