diff options
| author | Dave Jones <davej@redhat.com> | 2005-06-25 14:58:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 16:25:01 -0700 |
| commit | 4f00945a8e35e46b98f3ec4adae747397393e3ee (patch) | |
| tree | 3c38938741c17c7658855a3d4d794087cffdf78e /sound/oss | |
| parent | 155542c271ba76fec37146b26aea1001019eb60d (diff) | |
| download | linux-next-4f00945a8e35e46b98f3ec4adae747397393e3ee.tar.gz | |
[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>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/nm256.h | 3 | ||||
| -rw-r--r-- | 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 |