[2.5 patch] allow only one Toshiba Type-O IR Port driver in the

[Adrian Bunk]

Trying to compile both Toshiba Type-O IR Port drivers into the kernel
fails with the following error:

<--  snip  -->

...
   ld -m elf_i386  -r -o drivers/net/irda/built-in.o ...
drivers/net/irda/donauboe.o: In function `toshoboe_init':
drivers/net/irda/donauboe.o(.init.text+0x0): multiple definition of
`toshoboe_init'
drivers/net/irda/toshoboe.o(.init.text+0x0): first defined here
make[3]: *** [drivers/net/irda/built-in.o] Error 1

<--  snip  -->

The following patch allows the builing of the old driver only when the new
one isn't compiled into the kernel.

Additionally it indents three lines inside an if ... fi that weren't
indented.

--- linux-2.5.44-full/drivers/net/irda/Config.in.old	2002-10-20 14:37:54.000000000 +0200
+++ linux-2.5.44-full/drivers/net/irda/Config.in	2002-10-20 14:44:03.000000000 +0200
@@ -28,12 +28,14 @@
 dep_tristate 'IrDA USB dongles (EXPERIMENTAL)' CONFIG_USB_IRDA $CONFIG_IRDA $CONFIG_USB $CONFIG_EXPERIMENTAL
 dep_tristate 'NSC PC87108/PC87338' CONFIG_NSC_FIR  $CONFIG_IRDA
 dep_tristate 'Winbond W83977AF (IR)' CONFIG_WINBOND_FIR $CONFIG_IRDA
-dep_tristate 'Toshiba Type-O IR Port (old driver)' CONFIG_TOSHIBA_OLD $CONFIG_IRDA
 dep_tristate 'Toshiba Type-O IR Port' CONFIG_TOSHIBA_FIR $CONFIG_IRDA
+if [ "$CONFIG_TOSHIBA_FIR" != "y" ]; then
+   dep_tristate 'Toshiba Type-O IR Port (old driver)' CONFIG_TOSHIBA_OLD $CONFIG_IRDA
+fi
 if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then
-dep_tristate 'SMC IrCC (EXPERIMENTAL)' CONFIG_SMC_IRCC_FIR $CONFIG_IRDA
-dep_tristate 'ALi M5123 FIR (EXPERIMENTAL)' CONFIG_ALI_FIR $CONFIG_IRDA
-dep_tristate 'VLSI 82C147 SIR/MIR/FIR (EXPERIMENTAL)' CONFIG_VLSI_FIR $CONFIG_IRDA
+   dep_tristate 'SMC IrCC (EXPERIMENTAL)' CONFIG_SMC_IRCC_FIR $CONFIG_IRDA
+   dep_tristate 'ALi M5123 FIR (EXPERIMENTAL)' CONFIG_ALI_FIR $CONFIG_IRDA
+   dep_tristate 'VLSI 82C147 SIR/MIR/FIR (EXPERIMENTAL)' CONFIG_VLSI_FIR $CONFIG_IRDA
 fi
 if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
    dep_tristate 'SA1100 Internal IR' CONFIG_SA1100_FIR $CONFIG_IRDA

cu
Adrian

-- 

               "Is there not promise of rain?" Ling Tan asked suddenly out
                of the darkness. There had been need of rain for many days.
               "Only a promise," Lao Er said.
                                               Pearl S. Buck - Dragon Seed