Update of /cvsroot/alsa/alsa-kernel/drivers In directory sc8-pr-cvs1:/tmp/cvs-serv16547/drivers
Modified Files: dummy.c mtpav.c Log Message: Sync with the 2.5 kernel tree Index: dummy.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/drivers/dummy.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dummy.c 15 Mar 2003 16:20:07 -0000 1.17 +++ dummy.c 20 Mar 2003 16:45:58 -0000 1.18 @@ -57,8 +57,8 @@ #if 0 /* ICE1712 emulation */ #define MAX_BUFFER_SIZE (256 * 1024) #define USE_FORMATS SNDRV_PCM_FMTBIT_S32_LE -#define USE_CHANNELS_MIN 10 -#define USE_CHANNELS_MAX 10 +#define USE_CHANNELS_MIN 12 +#define USE_CHANNELS_MAX 12 #define USE_PERIODS_MIN 1 #define USE_PERIODS_MAX 1024 #endif Index: mtpav.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/drivers/mtpav.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mtpav.c 19 Feb 2003 09:33:44 -0000 1.23 +++ mtpav.c 20 Mar 2003 16:45:59 -0000 1.24 @@ -102,7 +102,7 @@ /* * defines */ -//#define USE_FAKE_MTP // dont actually read/write to MTP device (for debugging without an actual unit) (does not work yet) +//#define USE_FAKE_MTP // don't actually read/write to MTP device (for debugging without an actual unit) (does not work yet) // parallel port usage masks #define SIGS_BYTE 0x08 @@ -763,7 +763,7 @@ if (err < 0) goto __error; - err = snd_card_register(mtp_card->card); // dont snd_card_register until AFTER all cards reources done! + err = snd_card_register(mtp_card->card); // don't snd_card_register until AFTER all cards reources done! //printk("snd_card_register returned %d\n", err); if (err < 0) ------------------------------------------------------- This SF.net email is sponsored by: Tablet PC. Does your code think in ink? You could win a Tablet PC. Get a free Tablet PC hat just for playing. What are you waiting for? http://ads.sourceforge.net/cgi-bin/redirect.pl?micr5043en _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog