aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:24 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:24 +0200
commitd108728ea24a766335ae22f10bfaf41f248fb70e (patch)
tree4733918894ccc02119b19fdee42cbd978868d05c
parentab2f06cb6b7cc4cb782387a19fbfed3dfe8a8436 (diff)
parentef9dfa4b1052af23a603de382d4665b2d1fccc61 (diff)
Merge branch 'topic/cleanup' into for-linus
* topic/cleanup: ALSA: Remove deprecated include/sound/driver.h ALSA: Remove deprecated snd_card_new()
-rw-r--r--include/sound/core.h10
-rw-r--r--include/sound/driver.h1
2 files changed, 0 insertions, 11 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index 0e8ae10155a..309cb9659a0 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -300,16 +300,6 @@ int snd_card_create(int idx, const char *id,
struct module *module, int extra_size,
struct snd_card **card_ret);
-static inline __deprecated
-struct snd_card *snd_card_new(int idx, const char *id,
- struct module *module, int extra_size)
-{
- struct snd_card *card;
- if (snd_card_create(idx, id, module, extra_size, &card) < 0)
- return NULL;
- return card;
-}
-
int snd_card_disconnect(struct snd_card *card);
int snd_card_free(struct snd_card *card);
int snd_card_free_when_closed(struct snd_card *card);
diff --git a/include/sound/driver.h b/include/sound/driver.h
deleted file mode 100644
index f0359437d01..00000000000
--- a/include/sound/driver.h
+++ /dev/null
@@ -1 +0,0 @@
-#warning "This file is deprecated"