From 626327d9f70f62340d0348b606f8be1da7c33b32 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Tue, 30 Oct 2007 08:59:14 +0100 Subject: [PATCH] --- yaml --- r: 73909 b: refs/heads/master c: 56c36ca3b2df3ad8f2a3b7d3fba3670695163aaa h: refs/heads/master i: 73907: 1c9e5e33d2d8fd146c148a28625a1c4db1b5bb1f v: v3 --- [refs] | 2 +- trunk/sound/pci/cmipci.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2d4ad687ab6f..e2e472a7a4ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d29240ce57d96db7300360d1e6f18357810a5c2b +refs/heads/master: 56c36ca3b2df3ad8f2a3b7d3fba3670695163aaa diff --git a/trunk/sound/pci/cmipci.c b/trunk/sound/pci/cmipci.c index 6832649879ce..1fa5f004e858 100644 --- a/trunk/sound/pci/cmipci.c +++ b/trunk/sound/pci/cmipci.c @@ -246,10 +246,9 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address."); #define CM_MMODE_MASK 0x00000E00 /* model DAA interface mode */ #define CM_SPDIF_SELECT2 0x00000100 /* for model > 039 ? */ #define CM_ENCENTER 0x00000080 -#define CM_FLINKON 0x00000080 /* force modem link detection on, model 037 */ +#define CM_FLINKON 0x00000040 /* force modem link detection on, model 037 */ #define CM_MUTECH1 0x00000040 /* mute PCI ch1 to DAC */ -#define CM_FLINKOFF 0x00000040 /* force modem link detection off, model 037 */ -#define CM_UNKNOWN_18_5 0x00000020 /* ? */ +#define CM_FLINKOFF 0x00000020 /* force modem link detection off, model 037 */ #define CM_MIDSMP 0x00000010 /* 1/2 interpolation at front end DAC */ #define CM_UPDDMA_MASK 0x0000000C /* TDMA position update notification */ #define CM_UPDDMA_2048 0x00000000