diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /arch/arm/kernel/ecard.c | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'arch/arm/kernel/ecard.c')
| -rw-r--r-- | arch/arm/kernel/ecard.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index 61eb422b2..b4d38e00f 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c @@ -33,9 +33,7 @@ #include <linux/interrupt.h> #include <linux/mm.h> #include <linux/malloc.h> -#include <linux/errno.h> #include <linux/proc_fs.h> -#include <linux/unistd.h> #include <linux/init.h> #include <asm/dma.h> @@ -913,7 +911,6 @@ ecard_probe(int slot, card_type_t type) ecard_t **ecp; ecard_t *ec; struct ex_ecid cid; - char buffer[200]; int i, rc = -ENOMEM; ec = kmalloc(sizeof(ecard_t), GFP_KERNEL); @@ -994,12 +991,9 @@ ecard_probe(int slot, card_type_t type) nodev: if (rc && ec) kfree(ec); - else { + else slot_to_expcard[slot] = ec; - ecard_prints(buffer, ec); - printk("%s", buffer); - } return rc; } @@ -1075,7 +1069,7 @@ void __init ecard_init(void) init_waitqueue_head(&ecard_done); #endif - printk("Probing expansion cards: (does not imply support)\n"); + printk("Probing expansion cards\n"); for (slot = 0; slot < 8; slot ++) { if (ecard_probe(slot, ECARD_EASI) == -ENODEV) |