On Tuesday 25 November 2008 12:10:29 Keith A. Milner wrote: > I've been trying to check out the latest alsa-driver source to do some work > on it. I followed the instructions at: > http://www.alsa-project.org/main/index.php/GIT_Server#Occasional_Developers > > But when I cd alsa-drivers and gitcompile, it fails: > > make[1]: Entering directory > `/homedirs/kamilner/Development/Workspace/alsa/alsa-driver/acore' > copying file alsa-kernel/core/init.c > patching file init.c > Hunk #2 succeeded at 280 (offset 3 lines). > Hunk #3 succeeded at 306 (offset 3 lines). > Hunk #4 FAILED at 568. > 1 out of 4 hunks FAILED -- saving rejects to file init.c.rej > make[1]: *** [init.c] Error 1 > make[1]: Leaving directory > `/homedirs/kamilner/Development/Workspace/alsa/alsa-driver/acore' > make: *** [dep] Error 1 I see this too. My kernel: ubuntu 2.6.24-21-generic Heres the .rej file. *************** *** 552,560 **** return -EINVAL; #ifndef CONFIG_SYSFS_DEPRECATED if (!card->card_dev) { card->card_dev = device_create(sound_class, card->dev, MKDEV(0, 0), NULL, "card%i", card->number); if (IS_ERR(card->card_dev)) card->card_dev = NULL; } --- 568,586 ---- return -EINVAL; #ifndef CONFIG_SYSFS_DEPRECATED if (!card->card_dev) { + #ifdef CONFIG_SND_HAS_DEVICE_CREATE_DRVDATA + card->card_dev = device_create_drvdata(sound_class, card->dev, + MKDEV(0, 0), NULL, + "card%i", card->number); + #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) card->card_dev = device_create(sound_class, card->dev, MKDEV(0, 0), NULL, "card%i", card->number); + #else + card->card_dev = device_create(sound_class, card->dev, + MKDEV(0, 0), + "card%i", card->number); + #endif if (IS_ERR(card->card_dev)) card->card_dev = NULL; } > > Do I have the right version? Am I going about this the right way? I see a > lot of posts on this list talking about CVS but none mentioning git. > > Maybe I should be using CVS instead? No. git is right. -- -- Eliot Blennerhassett www.audioscience.com _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
