ALSA: atiixp: Specify codec for Foxconn RC4107MA-RS2

[safe/jmp/linux-2.6] / sound / oss / pas2_card.c

diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c
index 4ebb963..7f377ec 100644 (file)
--- a/sound/oss/pas2_card.c
+++ b/sound/oss/pas2_card.c
@@ -88,7 +88,7 @@ void pas_write(unsigned char data, int ioaddr)
 
 /******************* Begin of the Interrupt Handler ********************/
 
-static irqreturn_t pasintr(int irq, void *dev_id, struct pt_regs *dummy)
+static irqreturn_t pasintr(int irq, void *dev_id)
 {
        int             status;
 
@@ -156,9 +156,7 @@ static int __init config_pas_hw(struct address_info *hw_config)
                                                 * 0x80
                                                 */ , 0xB88);
 
-       pas_write(0x80
-                 | joystick?0x40:0
-                 ,0xF388);
+       pas_write(0x80 | (joystick ? 0x40 : 0), 0xF388);
 
        if (pas_irq < 0 || pas_irq > 15)
        {