diff options
Diffstat (limited to 'sound/oss/dmasound/dmasound.h')
-rw-r--r-- | sound/oss/dmasound/dmasound.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h index 25dd5a318eb4..d978b0096564 100644 --- a/sound/oss/dmasound/dmasound.h +++ b/sound/oss/dmasound/dmasound.h | |||
@@ -59,7 +59,6 @@ static inline int ioctl_return(int __user *addr, int value) | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #undef HAS_8BIT_TABLES | 61 | #undef HAS_8BIT_TABLES |
62 | #undef HAS_RECORD | ||
63 | 62 | ||
64 | #if defined(CONFIG_DMASOUND_ATARI) || defined(CONFIG_DMASOUND_ATARI_MODULE) ||\ | 63 | #if defined(CONFIG_DMASOUND_ATARI) || defined(CONFIG_DMASOUND_ATARI_MODULE) ||\ |
65 | defined(CONFIG_DMASOUND_PAULA) || defined(CONFIG_DMASOUND_PAULA_MODULE) ||\ | 64 | defined(CONFIG_DMASOUND_PAULA) || defined(CONFIG_DMASOUND_PAULA_MODULE) ||\ |
@@ -83,10 +82,6 @@ static inline int ioctl_return(int __user *addr, int value) | |||
83 | #define DEFAULT_N_BUFFERS 4 | 82 | #define DEFAULT_N_BUFFERS 4 |
84 | #define DEFAULT_BUFF_SIZE (1<<15) | 83 | #define DEFAULT_BUFF_SIZE (1<<15) |
85 | 84 | ||
86 | #if defined(CONFIG_DMASOUND_PMAC) || defined(CONFIG_DMASOUND_PMAC_MODULE) | ||
87 | #define HAS_RECORD | ||
88 | #endif | ||
89 | |||
90 | /* | 85 | /* |
91 | * Initialization | 86 | * Initialization |
92 | */ | 87 | */ |
@@ -168,9 +163,6 @@ struct sound_settings { | |||
168 | SETTINGS soft; /* software settings */ | 163 | SETTINGS soft; /* software settings */ |
169 | SETTINGS dsp; /* /dev/dsp default settings */ | 164 | SETTINGS dsp; /* /dev/dsp default settings */ |
170 | TRANS *trans_write; /* supported translations */ | 165 | TRANS *trans_write; /* supported translations */ |
171 | #ifdef HAS_RECORD | ||
172 | TRANS *trans_read; /* supported translations */ | ||
173 | #endif | ||
174 | int volume_left; /* volume (range is machine dependent) */ | 166 | int volume_left; /* volume (range is machine dependent) */ |
175 | int volume_right; | 167 | int volume_right; |
176 | int bass; /* tone (range is machine dependent) */ | 168 | int bass; /* tone (range is machine dependent) */ |
@@ -253,11 +245,6 @@ struct sound_queue { | |||
253 | extern struct sound_queue dmasound_write_sq; | 245 | extern struct sound_queue dmasound_write_sq; |
254 | #define write_sq dmasound_write_sq | 246 | #define write_sq dmasound_write_sq |
255 | 247 | ||
256 | #ifdef HAS_RECORD | ||
257 | extern struct sound_queue dmasound_read_sq; | ||
258 | #define read_sq dmasound_read_sq | ||
259 | #endif | ||
260 | |||
261 | extern int dmasound_catchRadius; | 248 | extern int dmasound_catchRadius; |
262 | #define catchRadius dmasound_catchRadius | 249 | #define catchRadius dmasound_catchRadius |
263 | 250 | ||