diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/sound/sound_config.h | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'drivers/sound/sound_config.h')
| -rw-r--r-- | drivers/sound/sound_config.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/sound/sound_config.h b/drivers/sound/sound_config.h index d158a48ff..805de62dc 100644 --- a/drivers/sound/sound_config.h +++ b/drivers/sound/sound_config.h @@ -1,6 +1,6 @@ /* sound_config.h * - * A driver for Soundcards, misc configuration parameters. + * A driver for sound cards, misc. configuration parameters. */ /* * Copyright (C) by Hannu Savolainen 1993-1997 @@ -10,14 +10,19 @@ * for more info. */ -#include <linux/fs.h> -#include "local.h.master" + +#ifndef _SOUND_CONFIG_H_ +#define _SOUND_CONFIG_H_ + #include <linux/config.h> +#include <linux/fs.h> +#include <linux/sound.h> + +#include "legacy.h" #include "os.h" #include "soundvers.h" - #ifndef SND_DEFAULT_ENABLE #define SND_DEFAULT_ENABLE 1 #endif @@ -181,3 +186,5 @@ extern __inline__ int translate_mode(struct file *file) #define TIMER_ARMED 121234 #define TIMER_NOT_ARMED 1 + +#endif |