diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/pci/emu10k1/emu10k1x.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/pci/emu10k1/emu10k1x.c')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index df47f738098d..0c701e4ec8a5 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
| @@ -114,7 +114,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard."); | |||
| 114 | */ | 114 | */ |
| 115 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ | 115 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ |
| 116 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ | 116 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ |
| 117 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ | 117 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */ |
| 118 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size */ | 118 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size */ |
| 119 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Sample currently in DAC */ | 119 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Sample currently in DAC */ |
| 120 | #define PLAYBACK_UNKNOWN1 0x07 | 120 | #define PLAYBACK_UNKNOWN1 0x07 |