Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] version 1.0.14rc2
  [ALSA] Fix a typo in __dev* changes in portman2x4.c
  [ALSA] Change AT91 PDC register defines for 2.6.20 kernel
  [ALSA] SoC codecs - fix Kconfig - depends -> depends on
  [ALSA] Fix __devinit and __devexit issues with sound drivers
  [ALSA] hda-codec - Patch for enabling LFE on more Dell laptops
  [ALSA] hda-codec - More fixes for Conexant HD Audio support
  [ALSA] usb-audio: add PCR-A PCM support
  [ALSA] emu10k1: fix typo
  [ALSA] usbaudio - remove urb->bandwidth reference
  [ALSA] ac97 - Fix silent output problem with Cx20551 codec
  [ALSA] hda-codec - Fix Oops with probing sigmatel codec chips

diff --combined sound/drivers/virmidi.c
index 429af14,70e70ba..46f3d34
--- 1/sound/drivers/virmidi.c
--- 2/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@@ -44,6 -44,7 +44,6 @@@
  #include <sound/driver.h>
  #include <linux/init.h>
  #include <linux/wait.h>
 -#include <linux/sched.h>
  #include <linux/err.h>
  #include <linux/platform_device.h>
  #include <linux/moduleparam.h>
@@@ -84,7 -85,7 +84,7 @@@ struct snd_card_virmidi 
  static struct platform_device *devices[SNDRV_CARDS];
  
  
- static int __init snd_virmidi_probe(struct platform_device *devptr)
+ static int __devinit snd_virmidi_probe(struct platform_device *devptr)
  {
        struct snd_card *card;
        struct snd_card_virmidi *vmidi;
@@@ -128,7 -129,7 +128,7 @@@
        return err;
  }
  
- static int snd_virmidi_remove(struct platform_device *devptr)
+ static int __devexit snd_virmidi_remove(struct platform_device *devptr)
  {
        snd_card_free(platform_get_drvdata(devptr));
        platform_set_drvdata(devptr, NULL);
@@@ -139,7 -140,7 +139,7 @@@
  
  static struct platform_driver snd_virmidi_driver = {
        .probe          = snd_virmidi_probe,
-       .remove         = snd_virmidi_remove,
+       .remove         = __devexit_p(snd_virmidi_remove),
        .driver         = {
                .name   = SND_VIRMIDI_DRIVER
        },