diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /include/sound/minors.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'include/sound/minors.h')
| -rw-r--r-- | include/sound/minors.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/minors.h b/include/sound/minors.h index 46bcd2023ed8..a81798ab73ed 100644 --- a/include/sound/minors.h +++ b/include/sound/minors.h | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #define SNDRV_OS_MINORS 256 | ||
| 25 | |||
| 24 | #define SNDRV_MINOR_DEVICES 32 | 26 | #define SNDRV_MINOR_DEVICES 32 |
| 25 | #define SNDRV_MINOR_CARD(minor) ((minor) >> 5) | 27 | #define SNDRV_MINOR_CARD(minor) ((minor) >> 5) |
| 26 | #define SNDRV_MINOR_DEVICE(minor) ((minor) & 0x001f) | 28 | #define SNDRV_MINOR_DEVICE(minor) ((minor) & 0x001f) |