diff options
Diffstat (limited to 'drivers/mtd')
| -rw-r--r--[-rwxr-xr-x] | drivers/mtd/chips/cfi_util.c | 0 | ||||
| -rw-r--r-- | drivers/mtd/chips/jedec_probe.c | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/mtd/inftlcore.c | 0 | ||||
| -rw-r--r-- | drivers/mtd/maps/pismo.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/maps/plat-ram.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/bcm_umi_nand.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c index ca584d0380b..ca584d0380b 100755..100644 --- a/drivers/mtd/chips/cfi_util.c +++ b/drivers/mtd/chips/cfi_util.c | |||
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c index 1bec5e1ce6a..8db1148dfa4 100644 --- a/drivers/mtd/chips/jedec_probe.c +++ b/drivers/mtd/chips/jedec_probe.c | |||
| @@ -226,7 +226,7 @@ struct unlock_addr { | |||
| 226 | * exists, but is for MTD_UADDR_NOT_SUPPORTED - and, therefore, | 226 | * exists, but is for MTD_UADDR_NOT_SUPPORTED - and, therefore, |
| 227 | * should not be used. The problem is that structures with | 227 | * should not be used. The problem is that structures with |
| 228 | * initializers have extra fields initialized to 0. It is _very_ | 228 | * initializers have extra fields initialized to 0. It is _very_ |
| 229 | * desireable to have the unlock address entries for unsupported | 229 | * desirable to have the unlock address entries for unsupported |
| 230 | * data widths automatically initialized - that means that | 230 | * data widths automatically initialized - that means that |
| 231 | * MTD_UADDR_NOT_SUPPORTED must be 0 and the first entry here | 231 | * MTD_UADDR_NOT_SUPPORTED must be 0 and the first entry here |
| 232 | * must go unused. | 232 | * must go unused. |
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c index 8aca5523a33..8aca5523a33 100755..100644 --- a/drivers/mtd/inftlcore.c +++ b/drivers/mtd/inftlcore.c | |||
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c index c48cad271f5..30e12c88d1d 100644 --- a/drivers/mtd/maps/pismo.c +++ b/drivers/mtd/maps/pismo.c | |||
| @@ -118,7 +118,7 @@ static int __devinit pismo_add_device(struct pismo_data *pismo, int i, | |||
| 118 | { | 118 | { |
| 119 | struct platform_device *dev; | 119 | struct platform_device *dev; |
| 120 | struct resource res = { }; | 120 | struct resource res = { }; |
| 121 | phys_addr_t base = region.base; | 121 | phys_addr_t base = region->base; |
| 122 | int ret; | 122 | int ret; |
| 123 | 123 | ||
| 124 | if (base == ~0) | 124 | if (base == ~0) |
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c index dafb91944e7..76a76be5a7b 100644 --- a/drivers/mtd/maps/plat-ram.c +++ b/drivers/mtd/maps/plat-ram.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * http://www.simtec.co.uk/products/SWLINUX/ | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| 5 | * Ben Dooks <ben@simtec.co.uk> | 5 | * Ben Dooks <ben@simtec.co.uk> |
| 6 | * | 6 | * |
| 7 | * Generic platfrom device based RAM map | 7 | * Generic platform device based RAM map |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index bb646560423..1157d5679e6 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
| @@ -444,7 +444,7 @@ config MTD_NAND_FSL_UPM | |||
| 444 | 444 | ||
| 445 | config MTD_NAND_MXC | 445 | config MTD_NAND_MXC |
| 446 | tristate "MXC NAND support" | 446 | tristate "MXC NAND support" |
| 447 | depends on ARCH_MX2 || ARCH_MX3 | 447 | depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 |
| 448 | help | 448 | help |
| 449 | This enables the driver for the NAND flash controller on the | 449 | This enables the driver for the NAND flash controller on the |
| 450 | MXC processors. | 450 | MXC processors. |
diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c index 087bcd745bb..7d1cca7a31a 100644 --- a/drivers/mtd/nand/bcm_umi_nand.c +++ b/drivers/mtd/nand/bcm_umi_nand.c | |||
| @@ -381,7 +381,7 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev) | |||
| 381 | if (!r) | 381 | if (!r) |
| 382 | return -ENXIO; | 382 | return -ENXIO; |
| 383 | 383 | ||
| 384 | /* map physical adress */ | 384 | /* map physical address */ |
| 385 | bcm_umi_io_base = ioremap(r->start, r->end - r->start + 1); | 385 | bcm_umi_io_base = ioremap(r->start, r->end - r->start + 1); |
| 386 | 386 | ||
| 387 | if (!bcm_umi_io_base) { | 387 | if (!bcm_umi_io_base) { |
| @@ -525,7 +525,7 @@ static int bcm_umi_nand_remove(struct platform_device *pdev) | |||
| 525 | /* Release resources, unregister device */ | 525 | /* Release resources, unregister device */ |
| 526 | nand_release(board_mtd); | 526 | nand_release(board_mtd); |
| 527 | 527 | ||
| 528 | /* unmap physical adress */ | 528 | /* unmap physical address */ |
| 529 | iounmap(bcm_umi_io_base); | 529 | iounmap(bcm_umi_io_base); |
| 530 | 530 | ||
| 531 | /* Free the MTD device structure */ | 531 | /* Free the MTD device structure */ |
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 45dec5770da..b2900d8406d 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c | |||
| @@ -507,7 +507,7 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) | |||
| 507 | * MXC NANDFC can only perform full page+spare or | 507 | * MXC NANDFC can only perform full page+spare or |
| 508 | * spare-only read/write. When the upper layers | 508 | * spare-only read/write. When the upper layers |
| 509 | * layers perform a read/write buf operation, | 509 | * layers perform a read/write buf operation, |
| 510 | * we will used the saved column adress to index into | 510 | * we will used the saved column address to index into |
| 511 | * the full page. | 511 | * the full page. |
| 512 | */ | 512 | */ |
| 513 | send_addr(host, 0, page_addr == -1); | 513 | send_addr(host, 0, page_addr == -1); |
