From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 7 Sep 2009 13:52:30 +0000 (+0200)
Subject: ALSA: Remove unneeded ifdef from sound/core.h
X-Git-Tag: v2.6.32-rc3~9^2~24^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8c60ede6abf8e96a892c114131700b0cfb0be89;p=profile%2Fcommon%2Fkernel-common.git

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>
---

diff --git a/include/sound/core.h b/include/sound/core.h
index 3bb07bc..f545efc 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);
 int snd_card_file_add(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))
-#endif
 
 /* device.c */
 
@@ -429,12 +427,10 @@ static inline int __snd_bug_on(int cond)
 
 /* for easier backward-porting */
 #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_port_data(gp,r) ((gp)->port_data = (r))
 #define gameport_get_port_data(gp) (gp)->port_data
 #endif
-#endif
 
 /* PCI quirk list helper */
 struct snd_pci_quirk {