diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/mtd | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/cfi_cmdset_0002.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/mapped.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/cfi_cmdset_0002.c b/drivers/mtd/cfi_cmdset_0002.c index d2736c024..2797c768e 100644 --- a/drivers/mtd/cfi_cmdset_0002.c +++ b/drivers/mtd/cfi_cmdset_0002.c @@ -437,7 +437,7 @@ static int cfi_amdext_erase_2_by_16 (struct mtd_info *mtd, struct erase_info *in adr = instr->addr - (chipnum << cfi->chipshift) * (cfi->interleave); len = instr->len; -printk("erase : 0x%x 0x%x 0x%x\n", adr, len, chipnum, mtd->size); +printk("erase : 0x%lx 0x%lx 0x%x 0x%x\n", adr, len, chipnum, mtd->size); while(len) { //printk("erase : 0x%x 0x%x 0x%x 0x%x\n", chipnum, adr, len, cfi->chipshift); diff --git a/drivers/mtd/mapped.c b/drivers/mtd/mapped.c index 84a74036e..45db9e442 100644 --- a/drivers/mtd/mapped.c +++ b/drivers/mtd/mapped.c @@ -21,7 +21,6 @@ #include <linux/delay.h> #include <linux/sched.h> #include <asm/io.h> -#include <asm/delay.h> struct JEDECTable mtd_JEDEC_table[] = {{0x01AD,"AMD Am29F016",2*1024*1024,64*1024,MTD_CAP_NORFLASH}, |