Merge tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-beck.git] / sound / ppc / powermac.c

diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index f5ceb6f282decab0e89e4b8c5637c0520efde7d9..09fc848d32ecd475951f09513e492e78a03d2a1c 100644 (file)
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -51,7 +51,7 @@ static struct platform_device *device;
 /*
  */
 
-static int __devinit snd_pmac_probe(struct platform_device *devptr)
+static int snd_pmac_probe(struct platform_device *devptr)
 {
        struct snd_card *card;
        struct snd_pmac *chip;
@@ -136,14 +136,14 @@ __error:
 }
 
 
-static int __devexit snd_pmac_remove(struct platform_device *devptr)
+static int snd_pmac_remove(struct platform_device *devptr)
 {
        snd_card_free(platform_get_drvdata(devptr));
        platform_set_drvdata(devptr, NULL);
        return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int snd_pmac_driver_suspend(struct device *dev)
 {
        struct snd_card *card = dev_get_drvdata(dev);
@@ -168,7 +168,7 @@ static SIMPLE_DEV_PM_OPS(snd_pmac_pm, snd_pmac_driver_suspend, snd_pmac_driver_r
 
 static struct platform_driver snd_pmac_driver = {
        .probe          = snd_pmac_probe,
-       .remove         = __devexit_p(snd_pmac_remove),
+       .remove         = snd_pmac_remove,
        .driver         = {
                .name   = SND_PMAC_DRIVER,
                .owner  = THIS_MODULE,