From 56b01e29820419e20723d0cd9f01546264840254 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 20 May 2006 15:00:35 -0700
Subject: [PATCH] --- yaml --- r: 26883 b: refs/heads/master c:
 db31419404e5ccc7e8e07000a5f1ac440a0eafa0 h: refs/heads/master i:   26881:
 353705e6002a00d31973943b89260fb26f435e5f   26879:
 7ba7acba1bdeb4c94b7ac029bc3eb65fe3d94cf0 v: v3

---
 [refs]                        | 2 +-
 trunk/sound/oss/nm256_audio.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c9a83c0ded40..2a2787b3688b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1caef6aa97a3a43a82f238d8b31bf177de34a4bf
+refs/heads/master: db31419404e5ccc7e8e07000a5f1ac440a0eafa0
diff --git a/trunk/sound/oss/nm256_audio.c b/trunk/sound/oss/nm256_audio.c
index 7de079b202f2..6e662ac009ae 100644
--- a/trunk/sound/oss/nm256_audio.c
+++ b/trunk/sound/oss/nm256_audio.c
@@ -960,7 +960,7 @@ static struct ac97_mixer_value_list mixer_defaults[] = {
 
 
 /* Installs the AC97 mixer into CARD.  */
-static int __init
+static int __devinit
 nm256_install_mixer (struct nm256_info *card)
 {
     int mixer;
@@ -995,7 +995,7 @@ nm256_install_mixer (struct nm256_info *card)
  * RAM.
  */
 
-static void __init
+static void __devinit
 nm256_peek_for_sig (struct nm256_info *card)
 {
     u32 port1offset 
@@ -1056,7 +1056,7 @@ nm256_install(struct pci_dev *pcidev, enum nm256rev rev, char *verstr)
     card->playing  = 0;
     card->recording = 0;
     card->rev = rev;
-	spin_lock_init(&card->lock);
+    spin_lock_init(&card->lock);
 
     /* Init the memory port info.  */
     for (x = 0; x < 2; x++) {