lkml.org 
[lkml]   [2005]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [2.6 patch] sound/oss/: cleanups
On Tue, 29 Mar 2005 00:03:07 +0200, Adrian Bunk <bunk@stusta.de> wrote:
> On Mon, Mar 28, 2005 at 03:55:36PM -0500, Benoit Boissinot wrote:
> > On Sun, 6 Mar 2005 23:07:47 +0100, Adrian Bunk <bunk@stusta.de> wrote:
> > > This patch contains cleanups including the following:
> > > - make needlessly global code static
> > >
> That's a different problem.
> Please apply the patch below on top of my other patch.
>
> <-- snip -->
>
> Rearrange sound/oss/nm256_audio.c and to drop nm256_debug from nm256.h
> since it confuses gcc 4.0 .

Could this patch go in -mm (it is needed for allyesconfig and gcc-4).

Thanks,

Benoit
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> --- linux-2.6.12-rc1-mm3-full/sound/oss/nm256.h.old 2005-03-28 23:49:39.000000000 +0200
> +++ linux-2.6.12-rc1-mm3-full/sound/oss/nm256.h 2005-03-28 23:51:33.000000000 +0200
> @@ -128,9 +128,6 @@
> 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. */
> --- linux-2.6.12-rc1-mm3-full/sound/oss/nm256_audio.c.old 2005-03-28 23:51:53.000000000 +0200
> +++ linux-2.6.12-rc1-mm3-full/sound/oss/nm256_audio.c 2005-03-28 23:52:19.000000000 +0200
> @@ -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
>
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-04-06 13:31    [from the cache]
©2003-2011 Jasper Spaans. Advertise on this site