diff --git a/[refs] b/[refs]
index b18088de8902..ea2988701d9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 155542c271ba76fec37146b26aea1001019eb60d
+refs/heads/master: 4f00945a8e35e46b98f3ec4adae747397393e3ee
diff --git a/trunk/sound/oss/nm256.h b/trunk/sound/oss/nm256.h
index 762331765328..21e07b5081f2 100644
--- a/trunk/sound/oss/nm256.h
+++ b/trunk/sound/oss/nm256.h
@@ -128,9 +128,6 @@ struct nm256_info
     struct nm256_info *next_card;
 };
 
-/* Debug flag--bigger numbers mean more output. */
-extern int nm256_debug;
-
 /* The BIOS signature. */
 #define NM_SIGNATURE 0x4e4d0000
 /* Signature mask. */
diff --git a/trunk/sound/oss/nm256_audio.c b/trunk/sound/oss/nm256_audio.c
index f1a7ba6ae340..66970062eb36 100644
--- a/trunk/sound/oss/nm256_audio.c
+++ b/trunk/sound/oss/nm256_audio.c
@@ -28,12 +28,13 @@
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include "sound_config.h"
-#include "nm256.h"
-#include "nm256_coeff.h"
 
 static int nm256_debug;
 static int force_load;
 
+#include "nm256.h"
+#include "nm256_coeff.h"
+
 /* 
  * The size of the playback reserve.  When the playback buffer has less
  * than NM256_PLAY_WMARK_SIZE bytes to output, we request a new