From: Andrew Morton Signed-off-by: Andrew Morton --- include/sound/ac97_codec.h | 4 ---- sound/core/sound.c | 8 -------- sound/pci/ac97/ac97_codec.c | 4 ---- 3 files changed, 16 deletions(-) diff -puN sound/core/sound.c~git-alsa-fixup sound/core/sound.c --- a/sound/core/sound.c~git-alsa-fixup +++ a/sound/core/sound.c @@ -264,20 +264,12 @@ int snd_register_device_for_dev(int type return minor; } snd_minors[minor] = preg; -<<<<<<< HEAD/sound/core/sound.c if (card) device = card->dev; preg->dev = device_create(sound_class, device, MKDEV(major, minor), "%s", name); if (preg->dev) dev_set_drvdata(preg->dev, private_data); -======= - preg->class_dev = class_device_create(sound_class, NULL, - MKDEV(major, minor), - device, "%s", name); - if (preg->class_dev) - class_set_devdata(preg->class_dev, private_data); ->>>>>>> /sound/core/sound.c mutex_unlock(&sound_mutex); return 0; diff -puN include/sound/ac97_codec.h~git-alsa-fixup include/sound/ac97_codec.h --- a/include/sound/ac97_codec.h~git-alsa-fixup +++ a/include/sound/ac97_codec.h @@ -512,12 +512,8 @@ struct snd_ac97 { #ifdef CONFIG_SND_AC97_POWER_SAVE unsigned int power_up; /* power states */ -<<<<<<< HEAD/include/sound/ac97_codec.h struct workqueue_struct *power_workq; struct delayed_work power_work; -======= - struct work_struct power_work; ->>>>>>> /include/sound/ac97_codec.h #endif struct device dev; }; diff -puN sound/pci/ac97/ac97_codec.c~git-alsa-fixup sound/pci/ac97/ac97_codec.c --- a/sound/pci/ac97/ac97_codec.c~git-alsa-fixup +++ a/sound/pci/ac97/ac97_codec.c @@ -1995,12 +1995,8 @@ int snd_ac97_mixer(struct snd_ac97_bus * mutex_init(&ac97->reg_mutex); mutex_init(&ac97->page_mutex); #ifdef CONFIG_SND_AC97_POWER_SAVE -<<<<<<< HEAD/sound/pci/ac97/ac97_codec.c ac97->power_workq = create_workqueue("ac97"); INIT_DELAYED_WORK(&ac97->power_work, do_update_power); -======= - INIT_WORK(&ac97->power_work, do_update_power, ac97); ->>>>>>> /sound/pci/ac97/ac97_codec.c #endif #ifdef CONFIG_PCI _