From 562ca92a06dadbd856a12c4553d6f903bc000541 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 21 Aug 2006 19:22:45 +0200
Subject: [PATCH] --- yaml --- r: 34896 b: refs/heads/master c:
 93f09c4cc111506db2ffa6220b7a3d7f73e41aa3 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/sound/pci/emu10k1/emu10k1.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e915ad88bc8c..9366f2ffcb2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab93c7ae54a81bcecb77608ca89eea140f1d45ad
+refs/heads/master: 93f09c4cc111506db2ffa6220b7a3d7f73e41aa3
diff --git a/trunk/sound/pci/emu10k1/emu10k1.c b/trunk/sound/pci/emu10k1/emu10k1.c
index 289bcd99c19c..493ec0816bb3 100644
--- a/trunk/sound/pci/emu10k1/emu10k1.c
+++ b/trunk/sound/pci/emu10k1/emu10k1.c
@@ -232,7 +232,7 @@ static int snd_emu10k1_suspend(struct pci_dev *pci, pm_message_t state)
 	return 0;
 }
 
-int snd_emu10k1_resume(struct pci_dev *pci)
+static int snd_emu10k1_resume(struct pci_dev *pci)
 {
 	struct snd_card *card = pci_get_drvdata(pci);
 	struct snd_emu10k1 *emu = card->private_data;