From 4f00945a8e35e46b98f3ec4adae747397393e3ee Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Sat, 25 Jun 2005 14:58:53 -0700
Subject: [PATCH] [PATCH] nm256 oss build failure
static declaration follows non static
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
sound/oss/nm256.h | 3 ---
sound/oss/nm256_audio.c | 5 +++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/sound/oss/nm256.h b/sound/oss/nm256.h
index 762331765328..21e07b5081f2 100644
--- a/sound/oss/nm256.h
+++ b/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/sound/oss/nm256_audio.c b/sound/oss/nm256_audio.c
index f1a7ba6ae340..66970062eb36 100644
--- a/sound/oss/nm256_audio.c
+++ b/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
--
GitLab