diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-09 21:56:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-09 21:56:32 -0700 |
| commit | ae6a0c465d560a2c5e1fa16dd3d2ed769119cf2c (patch) | |
| tree | 6b4042bfe27b17e3457452c7283fe1fb205a13c6 /include | |
| parent | a54047f12b86955afe3123438e8e1da2687ecbb9 (diff) | |
| parent | 26bfac10251c9e04bc11690e7e1a5f6742313a4d (diff) | |
Merge http://linux-sound.bkbits.net/linux-sound
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/isapnp.h | 4 | ||||
| -rw-r--r-- | include/sound/sndmagic.h | 4 | ||||
| -rw-r--r-- | include/sound/version.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h index 9582944ab25c..b929eee854ab 100644 --- a/include/linux/isapnp.h +++ b/include/linux/isapnp.h @@ -115,8 +115,8 @@ void *isapnp_alloc(long size); int isapnp_proc_init(void); int isapnp_proc_done(void); #else -static inline isapnp_proc_init(void) { return 0; } -static inline isapnp_proc_done(void) { return 0; } +static inline int isapnp_proc_init(void) { return 0; } +static inline int isapnp_proc_done(void) { return 0; } #endif /* init/main.c */ diff --git a/include/sound/sndmagic.h b/include/sound/sndmagic.h index 9a80cfe7f484..646f7dc6369a 100644 --- a/include/sound/sndmagic.h +++ b/include/sound/sndmagic.h @@ -155,6 +155,7 @@ static inline int _snd_magic_bad(void *obj, unsigned long magic) #define snd_card_dummy_t_magic 0xa15a2501 #define snd_card_dummy_pcm_t_magic 0xa15a2502 #define opl3_t_magic 0xa15a2601 +#define opl4_t_magic 0xa15a2602 #define snd_seq_dummy_port_t_magic 0xa15a2701 #define ice1712_t_magic 0xa15a2801 #define ad1816a_t_magic 0xa15a2901 @@ -193,10 +194,9 @@ static inline int _snd_magic_bad(void *obj, unsigned long magic) #define snd_usb_midi_in_endpoint_t_magic 0xa15a3f03 #define ak4117_t_magic 0xa15a4000 #define psic_t_magic 0xa15a4100 -#define opl4_t_magic 0xa15a2602 #define vx_core_t_magic 0xa15a4110 #define vx_pipe_t_magic 0xa15a4112 - +#define azf3328_t_magic 0xa15a4200 #else diff --git a/include/sound/version.h b/include/sound/version.h index 23b5ee37b824..32fcc607f0db 100644 --- a/include/sound/version.h +++ b/include/sound/version.h @@ -1,3 +1,3 @@ /* include/version.h. Generated by configure. */ #define CONFIG_SND_VERSION "0.9.4" -#define CONFIG_SND_DATE " (Fri Jun 06 09:23:03 2003 UTC)" +#define CONFIG_SND_DATE " (Mon Jun 09 12:01:18 2003 UTC)" |