aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-02 09:41:56 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-02 09:41:56 -0400
commit29c798fecb9b846b363b0a02fa662ff42fc19426 (patch)
treee708d6aca8f098e69571780f702325b221b66694 /include/sound
parentASoC: fix the building issue of missing codec field in 'struct snd_soc_card' (diff)
parentLinux 2.6.37-rc1 (diff)
downloadlinux-dev-29c798fecb9b846b363b0a02fa662ff42fc19426.tar.xz
linux-dev-29c798fecb9b846b363b0a02fa662ff42fc19426.zip
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/core.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index c129f0813bae..1fa2407c966f 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -133,9 +133,7 @@ struct snd_card {
int free_on_last_close; /* free in context of file_release */
wait_queue_head_t shutdown_sleep;
struct device *dev; /* device assigned to this card */
-#ifndef CONFIG_SYSFS_DEPRECATED
struct device *card_dev; /* cardX object for sysfs */
-#endif
#ifdef CONFIG_PM
unsigned int power_state; /* power state */
@@ -196,11 +194,7 @@ struct snd_minor {
/* return a device pointer linked to each sound device as a parent */
static inline struct device *snd_card_get_device_link(struct snd_card *card)
{
-#ifdef CONFIG_SYSFS_DEPRECATED
- return card ? card->dev : NULL;
-#else
return card ? card->card_dev : NULL;
-#endif
}
/* sound.c */