/[openvortex]/alsa/alsa-kernel/pci/ymfpci/ymfpci.c
ViewVC logotype

Diff of /alsa/alsa-kernel/pci/ymfpci/ymfpci.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by vizard, Sat May 31 02:35:12 2003 UTC revision 1.3 by vizard, Mon Aug 11 00:06:40 2003 UTC
# Line 229  static int __devinit snd_card_ymfpci_pro Line 229  static int __devinit snd_card_ymfpci_pro
229                          return err;                          return err;
230                  }                  }
231          }          }
232    #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
233          if ((err = snd_ymfpci_joystick(chip)) < 0) {          if ((err = snd_ymfpci_joystick(chip)) < 0) {
234                  printk(KERN_WARNING "ymfpci: cannot initialize joystick, skipping...\n");                  printk(KERN_WARNING "ymfpci: cannot initialize joystick, skipping...\n");
235          }          }
236    #endif
237          strcpy(card->driver, str);          strcpy(card->driver, str);
238          sprintf(card->shortname, "Yamaha DS-XG PCI (%s)", str);          sprintf(card->shortname, "Yamaha DS-XG PCI (%s)", str);
239          sprintf(card->longname, "%s at 0x%lx, irq %i",          sprintf(card->longname, "%s at 0x%lx, irq %i",
# Line 249  static int __devinit snd_card_ymfpci_pro Line 251  static int __devinit snd_card_ymfpci_pro
251  }  }
252    
253  #ifdef CONFIG_PM  #ifdef CONFIG_PM
 #ifndef PCI_OLD_SUSPEND  
254  static int snd_card_ymfpci_suspend(struct pci_dev *pci, u32 state)  static int snd_card_ymfpci_suspend(struct pci_dev *pci, u32 state)
255  {  {
256          ymfpci_t *chip = snd_magic_cast(ymfpci_t, pci_get_drvdata(pci), return -ENXIO);          ymfpci_t *chip = snd_magic_cast(ymfpci_t, pci_get_drvdata(pci), return -ENXIO);
# Line 262  static int snd_card_ymfpci_resume(struct Line 263  static int snd_card_ymfpci_resume(struct
263          snd_ymfpci_resume(chip);          snd_ymfpci_resume(chip);
264          return 0;          return 0;
265  }  }
 #else  
 static void snd_card_ymfpci_suspend(struct pci_dev *pci)  
 {  
         ymfpci_t *chip = snd_magic_cast(ymfpci_t, pci_get_drvdata(pci), return);  
         snd_ymfpci_suspend(chip);  
 }  
 static void snd_card_ymfpci_resume(struct pci_dev *pci)  
 {  
         ymfpci_t *chip = snd_magic_cast(ymfpci_t, pci_get_drvdata(pci), return);  
         snd_ymfpci_resume(chip);  
 }  
 #endif  
266  #endif  #endif
267    
268  static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)  static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26