diff options
author | Dave Jones <davej@redhat.com> | 2005-06-25 17:58:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:25:01 -0400 |
commit | 4f00945a8e35e46b98f3ec4adae747397393e3ee (patch) | |
tree | 3c38938741c17c7658855a3d4d794087cffdf78e | |
parent | 155542c271ba76fec37146b26aea1001019eb60d (diff) |
[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>
-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 | |||
128 | struct nm256_info *next_card; | 128 | struct nm256_info *next_card; |
129 | }; | 129 | }; |
130 | 130 | ||
131 | /* Debug flag--bigger numbers mean more output. */ | ||
132 | extern int nm256_debug; | ||
133 | |||
134 | /* The BIOS signature. */ | 131 | /* The BIOS signature. */ |
135 | #define NM_SIGNATURE 0x4e4d0000 | 132 | #define NM_SIGNATURE 0x4e4d0000 |
136 | /* Signature mask. */ | 133 | /* 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 @@ | |||
28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
29 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
30 | #include "sound_config.h" | 30 | #include "sound_config.h" |
31 | #include "nm256.h" | ||
32 | #include "nm256_coeff.h" | ||
33 | 31 | ||
34 | static int nm256_debug; | 32 | static int nm256_debug; |
35 | static int force_load; | 33 | static int force_load; |
36 | 34 | ||
35 | #include "nm256.h" | ||
36 | #include "nm256_coeff.h" | ||
37 | |||
37 | /* | 38 | /* |
38 | * The size of the playback reserve. When the playback buffer has less | 39 | * The size of the playback reserve. When the playback buffer has less |
39 | * than NM256_PLAY_WMARK_SIZE bytes to output, we request a new | 40 | * than NM256_PLAY_WMARK_SIZE bytes to output, we request a new |