Merge branch 'master' into upstream

[linux-2.6] / sound / core / sound.c

diff --git a/sound/core/sound.c b/sound/core/sound.c
index 02c8cc4ebffe7ef3a8ba6f949869dd246d9d3453..cd862728346cb03e74abe870f4a997c0e5fa6de7 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -332,7 +332,7 @@ EXPORT_SYMBOL(snd_unregister_device);
  *  INFO PART
  */
 
-static struct snd_info_entry *snd_minor_info_entry = NULL;
+static struct snd_info_entry *snd_minor_info_entry;
 
 static const char *snd_device_type_name(int type)
 {