diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/block/paride/paride.c | |
parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/block/paride/paride.c')
-rw-r--r-- | drivers/block/paride/paride.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c index 068deffd6..6e962d8c1 100644 --- a/drivers/block/paride/paride.c +++ b/drivers/block/paride/paride.c @@ -12,10 +12,11 @@ 1.01 GRG 1998.05.03 Use spinlocks 1.02 GRG 1998.05.05 init_proto, release_proto, ktti 1.03 GRG 1998.08.15 eliminate compiler warning + 1.04 GRG 1998.11.28 added support for FRIQ */ -#define PI_VERSION "1.03" +#define PI_VERSION "1.04" #include <linux/module.h> #include <linux/config.h> @@ -450,6 +451,11 @@ void paride_init( void ) pi_register(&frpw); }; #endif +#ifdef CONFIG_PARIDE_FRIQ + { extern struct pi_protocol friq; + pi_register(&friq); + }; +#endif #ifdef CONFIG_PARIDE_FIT2 { extern struct pi_protocol fit2; pi_register(&fit2); |