diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:49:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:49:21 -0400 |
| commit | e8a89cebdbaab14caaa26debdb4ffd493b8831af (patch) | |
| tree | e0843f082628408ce259c72db36da54dff603987 /drivers/mtd/inftlmount.c | |
| parent | 8196867c74890ccdf40a2b5e3e173597fbc4f9ac (diff) | |
| parent | 6ae0185fe201eae0548dace2a84acb5050fc8606 (diff) | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (79 commits)
mtd: Remove obsolete <mtd/compatmac.h> include
mtd: Update copyright notices
jffs2: Update copyright notices
mtd-physmap: add support users can assign the probe type in board files
mtd: remove redwood map driver
mxc_nand: Add v3 (i.MX51) Support
mxc_nand: support 8bit ecc
mxc_nand: fix correct_data function
mxc_nand: add V1_V2 namespace to registers
mxc_nand: factor out a check_int function
mxc_nand: make some internally used functions overwriteable
mxc_nand: rework get_dev_status
mxc_nand: remove 0xe00 offset from registers
mtd: denali: Add multi connected NAND support
mtd: denali: Remove set_ecc_config function
mtd: denali: Remove unuseful code in get_xx_nand_para functions
mtd: denali: Remove device_info_tag structure
mtd: m25p80: add support for the Winbond W25Q32 SPI flash chip
mtd: m25p80: add support for the Intel/Numonyx {16,32,64}0S33B SPI flash chips
mtd: m25p80: add support for the EON EN25P{32, 64} SPI flash chips
...
Fix up trivial conflicts in drivers/mtd/maps/{Kconfig,redwood.c} due to
redwood driver removal.
Diffstat (limited to 'drivers/mtd/inftlmount.c')
| -rw-r--r-- | drivers/mtd/inftlmount.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c index 8f988d7d3c5c..104052e774b0 100644 --- a/drivers/mtd/inftlmount.c +++ b/drivers/mtd/inftlmount.c | |||
| @@ -2,11 +2,11 @@ | |||
| 2 | * inftlmount.c -- INFTL mount code with extensive checks. | 2 | * inftlmount.c -- INFTL mount code with extensive checks. |
| 3 | * | 3 | * |
| 4 | * Author: Greg Ungerer (gerg@snapgear.com) | 4 | * Author: Greg Ungerer (gerg@snapgear.com) |
| 5 | * (C) Copyright 2002-2003, Greg Ungerer (gerg@snapgear.com) | 5 | * Copyright © 2002-2003, Greg Ungerer (gerg@snapgear.com) |
| 6 | * | 6 | * |
| 7 | * Based heavily on the nftlmount.c code which is: | 7 | * Based heavily on the nftlmount.c code which is: |
| 8 | * Author: Fabrice Bellard (fabrice.bellard@netgem.com) | 8 | * Author: Fabrice Bellard (fabrice.bellard@netgem.com) |
| 9 | * Copyright (C) 2000 Netgem S.A. | 9 | * Copyright © 2000 Netgem S.A. |
| 10 | * | 10 | * |
| 11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
| 12 | * it under the terms of the GNU General Public License as published by | 12 | * it under the terms of the GNU General Public License as published by |
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/mtd/mtd.h> | 34 | #include <linux/mtd/mtd.h> |
| 35 | #include <linux/mtd/nftl.h> | 35 | #include <linux/mtd/nftl.h> |
| 36 | #include <linux/mtd/inftl.h> | 36 | #include <linux/mtd/inftl.h> |
| 37 | #include <linux/mtd/compatmac.h> | ||
| 38 | 37 | ||
| 39 | /* | 38 | /* |
| 40 | * find_boot_record: Find the INFTL Media Header and its Spare copy which | 39 | * find_boot_record: Find the INFTL Media Header and its Spare copy which |