patch-2.4.3 linux/drivers/telephony/ixj.c

Next file: linux/drivers/usb/bluetooth.c
Previous file: linux/drivers/sound/ymfpci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.2/linux/drivers/telephony/ixj.c linux/drivers/telephony/ixj.c
@@ -6300,6 +6300,7 @@
 {
 	return 0;
 }
+#endif /* CONFIG_PCMCIA */
 
 #if defined(CONFIG_ISAPNP)
 extern __inline__ int ixj_probe_isa(int *cnt)
@@ -6448,7 +6449,6 @@
 	return 0;
 }
 #endif /* CONFIG_ISAPNP */
-#endif /* CONFIG_PCMCIA */
 
 #if defined(CONFIG_PCI)
 int __init ixj_probe_pci(int *cnt)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)