diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /include/sound/initval.h | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'include/sound/initval.h')
| -rw-r--r-- | include/sound/initval.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/sound/initval.h b/include/sound/initval.h index 2bf1508825a4..d29e3d31d149 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_AUTO_PROBE | ||
| 54 | static int snd_legacy_auto_probe(unsigned long *ports, int (*probe)(unsigned long port)) | ||
| 55 | { | ||
| 56 | int result = 0; /* number of detected cards */ | ||
| 57 | |||
| 58 | while ((signed long)*ports != -1) { | ||
| 59 | if (probe(*ports) >= 0) | ||
| 60 | result++; | ||
| 61 | ports++; | ||
| 62 | } | ||
| 63 | return result; | ||
| 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 | ||