diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2003-06-10 14:21:58 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2003-06-10 14:21:58 +0200 |
| commit | 5361cebd1a8ad08bd92256a116ff6186a1e107a4 (patch) | |
| tree | 2dc0ed3062fd9f57e242b55f590505e30c26ed1b /include/linux | |
| parent | 32538906f50bd177cbf7f17ab0dbfa935ba2613d (diff) | |
| parent | b57c43bf9663e3ea7db8ef33ad3aa4fe4268e22f (diff) | |
Merge suse.cz:/home/perex/bk/linux-sound/linux-sound
into suse.cz:/home/perex/bk/linux-sound/work
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/isapnp.h | 4 |
1 files changed, 2 insertions, 2 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 */ |