Browse Source

ALSA: Remove unneeded ifdef from sound/core.h

Remove the old hack that was needed for building alsa-driver modules
externally for old kernels.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 15 years ago
parent
commit
b8c60ede6a
1 changed files with 0 additions and 4 deletions
  1. 0 4
      include/sound/core.h

+ 0 - 4
include/sound/core.h

@@ -302,9 +302,7 @@ int snd_component_add(struct snd_card *card, const char *component);
 int snd_card_file_add(struct snd_card *card, struct file *file);
 int snd_card_file_add(struct snd_card *card, struct file *file);
 int snd_card_file_remove(struct snd_card *card, struct file *file);
 int snd_card_file_remove(struct snd_card *card, struct file *file);
 
 
-#ifndef snd_card_set_dev
 #define snd_card_set_dev(card, devptr) ((card)->dev = (devptr))
 #define snd_card_set_dev(card, devptr) ((card)->dev = (devptr))
-#endif
 
 
 /* device.c */
 /* device.c */
 
 
@@ -429,12 +427,10 @@ static inline int __snd_bug_on(int cond)
 
 
 /* for easier backward-porting */
 /* for easier backward-porting */
 #if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
 #if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
-#ifndef gameport_set_dev_parent
 #define gameport_set_dev_parent(gp,xdev) ((gp)->dev.parent = (xdev))
 #define gameport_set_dev_parent(gp,xdev) ((gp)->dev.parent = (xdev))
 #define gameport_set_port_data(gp,r) ((gp)->port_data = (r))
 #define gameport_set_port_data(gp,r) ((gp)->port_data = (r))
 #define gameport_get_port_data(gp) (gp)->port_data
 #define gameport_get_port_data(gp) (gp)->port_data
 #endif
 #endif
-#endif
 
 
 /* PCI quirk list helper */
 /* PCI quirk list helper */
 struct snd_pci_quirk {
 struct snd_pci_quirk {