[Hackndev-commit] SF.net SVN: hackndev: [711] linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c

[<hol...@us...>]

Revision: 711
          http://svn.sourceforge.net/hackndev/?rev=711&view=rev
Author:   holger_bocklet
Date:     2006-12-19 01:01:48 -0800 (Tue, 19 Dec 2006)

Log Message:
-----------
corrected ifdefs for palmtc in pxa-ac97 

Modified Paths:
--------------
    linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c

Modified: linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c
===================================================================
--- linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c	2006-12-09 11:51:06 UTC (rev 710)
+++ linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c	2006-12-19 09:01:48 UTC (rev 711)
@@ -191,7 +191,7 @@
 
 	status = GSR;
 	if (status) {
-#ifdef MACH_OMAP_PALMTC
+#ifdef CONFIG_MACH_OMAP_PALMTC
 		if (status & GSR_GSCI) {
 		    return IRQ_NONE;
 		}
@@ -361,8 +361,9 @@
 	ret = pxa2xx_pcm_new(card, &pxa2xx_ac97_pcm_client, &pxa2xx_ac97_pcm);
 	if (ret)
 		goto err;
-#ifdef MACH_OMAP_PALMTC
+#ifdef CONFIG_MACH_OMAP_PALMTC
 	ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, SA_SHIRQ, "AC97", dev);
+    printk("pxa-ac97: shared irq enabled");
 #else
 	ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, 0, "AC97", NULL);
 #endif
@@ -417,7 +418,7 @@
 		snd_card_free(card);
 		platform_set_drvdata(dev, NULL);
 		GCR |= GCR_ACLINK_OFF;
-#ifdef MACH_OMAP_PALMTC
+#ifdef CONFIG_MACH_OMAP_PALMTC
 		free_irq(IRQ_AC97, dev);
 #else
 		free_irq(IRQ_AC97, NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.