Update of /cvsroot/linux-vax/kernel-2.4/drivers/char/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv17293/char/pcmcia
Modified Files:
Config.in Makefile serial_cs.c
Removed Files:
serial_cb.c
Log Message:
synch 2.4.15 commit 55
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/pcmcia/Config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Config.in 14 Jan 2001 18:03:48 -0000 1.1.1.1
+++ Config.in 11 Apr 2002 13:31:04 -0000 1.2
@@ -2,29 +2,13 @@
# PCMCIA character device configuration
#
-if [ "$CONFIG_SERIAL" = "n" ]; then
- define_tristate CONFIG_PCMCIA_SERIAL n
-else
- if [ "$CONFIG_SERIAL" = "m" -o "$CONFIG_PCMCIA" = "m" ]; then
- define_tristate CONFIG_PCMCIA_SERIAL m
- else
- define_tristate CONFIG_PCMCIA_SERIAL y
- fi
-fi
-
-if [ "$CONFIG_PCMCIA_SERIAL" != "n" ]; then
- mainmenu_option next_comment
- comment 'PCMCIA character device support'
+mainmenu_option next_comment
+comment 'PCMCIA character devices'
- dep_tristate 'PCMCIA serial device support' CONFIG_PCMCIA_SERIAL_CS $CONFIG_PCMCIA_SERIAL
- if [ "$CONFIG_CARDBUS" = "y" ]; then
- dep_tristate 'CardBus serial device support' CONFIG_PCMCIA_SERIAL_CB $CONFIG_PCMCIA_SERIAL
- fi
+dep_tristate 'PCMCIA serial device support' CONFIG_PCMCIA_SERIAL_CS $CONFIG_SERIAL
+if [ "$CONFIG_PCMCIA_SERIAL_CS" = "y" ]; then
+ define_bool CONFIG_PCMCIA_CHRDEV y
+fi
- if [ "$CONFIG_PCMCIA_SERIAL_CS" = "y" -o \
- "$CONFIG_PCMCIA_SERIAL_CB" = "y" ]; then
- define_bool CONFIG_PCMCIA_CHRDEV y
- fi
+endmenu
- endmenu
-fi
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/pcmcia/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 14 Jan 2001 18:03:48 -0000 1.1.1.1
+++ Makefile 11 Apr 2002 13:31:04 -0000 1.2
@@ -16,6 +16,5 @@
obj- :=
obj-$(CONFIG_PCMCIA_SERIAL_CS) += serial_cs.o
-obj-$(CONFIG_PCMCIA_SERIAL_CB) += serial_cb.o
include $(TOPDIR)/Rules.make
Index: serial_cs.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/pcmcia/serial_cs.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- serial_cs.c 25 Feb 2001 23:15:04 -0000 1.1.1.2
+++ serial_cs.c 11 Apr 2002 13:31:04 -0000 1.2
@@ -357,6 +357,7 @@
found_port:
if (i != CS_SUCCESS) {
+ printk(KERN_NOTICE "serial_cs: no usable port range found, giving up\n");
cs_error(link->handle, RequestIO, i);
return -1;
}
@@ -436,6 +437,7 @@
i = CardServices(RequestIRQ, link->handle, &link->irq);
if (i != CS_SUCCESS) {
+ printk(KERN_NOTICE "serial_cs: no usable port range found, giving up\n");
cs_error(link->handle, RequestIRQ, i);
link->irq.AssignedIRQ = 0;
}
@@ -661,3 +663,5 @@
module_init(init_serial_cs);
module_exit(exit_serial_cs);
+
+MODULE_LICENSE("GPL");
--- serial_cb.c DELETED ---
|
