diff options
-rw-r--r-- | include/sound/core.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 3bb07bc62255..f545efcf03f2 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
@@ -302,9 +302,7 @@ int snd_component_add(struct snd_card *card, const char *component); | |||
302 | int snd_card_file_add(struct snd_card *card, struct file *file); | 302 | int snd_card_file_add(struct snd_card *card, struct file *file); |
303 | int snd_card_file_remove(struct snd_card *card, struct file *file); | 303 | int snd_card_file_remove(struct snd_card *card, struct file *file); |
304 | 304 | ||
305 | #ifndef snd_card_set_dev | ||
306 | #define snd_card_set_dev(card, devptr) ((card)->dev = (devptr)) | 305 | #define snd_card_set_dev(card, devptr) ((card)->dev = (devptr)) |
307 | #endif | ||
308 | 306 | ||
309 | /* device.c */ | 307 | /* device.c */ |
310 | 308 | ||
@@ -429,12 +427,10 @@ static inline int __snd_bug_on(int cond) | |||
429 | 427 | ||
430 | /* for easier backward-porting */ | 428 | /* for easier backward-porting */ |
431 | #if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE) | 429 | #if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE) |
432 | #ifndef gameport_set_dev_parent | ||
433 | #define gameport_set_dev_parent(gp,xdev) ((gp)->dev.parent = (xdev)) | 430 | #define gameport_set_dev_parent(gp,xdev) ((gp)->dev.parent = (xdev)) |
434 | #define gameport_set_port_data(gp,r) ((gp)->port_data = (r)) | 431 | #define gameport_set_port_data(gp,r) ((gp)->port_data = (r)) |
435 | #define gameport_get_port_data(gp) (gp)->port_data | 432 | #define gameport_get_port_data(gp) (gp)->port_data |
436 | #endif | 433 | #endif |
437 | #endif | ||
438 | 434 | ||
439 | /* PCI quirk list helper */ | 435 | /* PCI quirk list helper */ |
440 | struct snd_pci_quirk { | 436 | struct snd_pci_quirk { |