diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /include/linux/devpts_fs.h | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'include/linux/devpts_fs.h')
| -rw-r--r-- | include/linux/devpts_fs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/devpts_fs.h b/include/linux/devpts_fs.h index d9dfbb440..38164e6b2 100644 --- a/include/linux/devpts_fs.h +++ b/include/linux/devpts_fs.h @@ -46,14 +46,14 @@ extern unsigned int unix98_max_ptys; #endif #ifndef BUILDING_DEVPTS -extern inline void +static inline void devpts_pty_new(int line, kdev_t device) { if ( devpts_upcall_new ) return devpts_upcall_new(line,device); } -extern inline void +static inline void devpts_pty_kill(int line) { if ( devpts_upcall_kill ) @@ -63,10 +63,10 @@ devpts_pty_kill(int line) #else /* No /dev/pts filesystem at all */ -extern inline void +static inline void devpts_pty_new(int line, kdev_t device) { } -extern inline void +static inline void devpts_pty_kill(int line) { } #endif |