Merge git://git.infradead.org/mtd-2.6

Browse source

* 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.

...

This commit is contained in:

Linus Torvalds 2010-08-10 11:49:21 -07:00

parent 8196867c74 6ae0185fe2

commit e8a89cebdb

107 changed files with 1910 additions and 1525 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/blackfin/include/asm/nand.h

View file

12

drivers/mtd/Kconfig

View file

2

drivers/mtd/afs.c

View file

31

drivers/mtd/chips/cfi_cmdset_0001.c

View file

17

drivers/mtd/chips/cfi_cmdset_0002.c

View file

1

drivers/mtd/chips/cfi_cmdset_0020.c

View file

4

drivers/mtd/chips/cfi_probe.c

View file

1

drivers/mtd/chips/cfi_util.c

View file

1

drivers/mtd/chips/chipreg.c

View file

1

drivers/mtd/chips/map_absent.c

View file

1

drivers/mtd/chips/map_ram.c

View file

1

drivers/mtd/chips/map_rom.c

View file

17

drivers/mtd/cmdlinepart.c

View file

1

drivers/mtd/devices/docecc.c

View file

1

drivers/mtd/devices/docprobe.c

View file

43

drivers/mtd/devices/m25p80.c

View file

12

drivers/mtd/devices/mtd_dataflash.c

View file

1

drivers/mtd/devices/mtdram.c

View file

1

drivers/mtd/devices/pmc551.c

View file

2

drivers/mtd/devices/sst25l.c

View file

2

drivers/mtd/ftl.c

View file

6

drivers/mtd/inftlcore.c

View file

5

drivers/mtd/inftlmount.c

View file

20

drivers/mtd/lpddr/lpddr_cmds.c

View file

8

drivers/mtd/maps/Kconfig

View file

1

drivers/mtd/maps/Makefile

View file

35

drivers/mtd/maps/ixp4xx.c

View file

14

drivers/mtd/maps/physmap.c

View file

6

drivers/mtd/maps/physmap_of.c

View file

131

drivers/mtd/maps/redwood.c

View file

26

drivers/mtd/mtd_blkdevs.c

View file

19

drivers/mtd/mtdblock.c

View file

19

drivers/mtd/mtdblock_ro.c

View file

59

drivers/mtd/mtdchar.c

View file

38

drivers/mtd/mtdconcat.c

View file

21

drivers/mtd/mtdcore.c

View file

2

drivers/mtd/mtdoops.c

View file

31

drivers/mtd/mtdpart.c

View file

2

drivers/mtd/mtdsuper.c

View file

33

drivers/mtd/nand/Kconfig

View file

2

drivers/mtd/nand/atmel_nand.c

View file

117

drivers/mtd/nand/bf5xx_nand.c

View file

17

drivers/mtd/nand/davinci_nand.c

View file

1240

drivers/mtd/nand/denali.c

View file

140

drivers/mtd/nand/denali.h

View file

6

drivers/mtd/nand/diskonchip.c

View file

598

drivers/mtd/nand/mxc_nand.c

View file

79

drivers/mtd/nand/nand_base.c

View file

103

drivers/mtd/nand/nand_bbt.c

View file

4

drivers/mtd/nand/nand_ids.c

View file

14

drivers/mtd/nand/nandsim.c

View file

2

drivers/mtd/nand/plat_nand.c

View file

6

drivers/mtd/nand/r852.c

View file

1

drivers/mtd/nand/rtc_from4.c

View file

15

drivers/mtd/nand/s3c2410.c

View file

2

drivers/mtd/nand/sm_common.c

View file

25

drivers/mtd/nftlcore.c

View file

3

drivers/mtd/nftlmount.c

View file

4

drivers/mtd/ofpart.c

View file

4

drivers/mtd/onenand/Kconfig

View file

49

drivers/mtd/onenand/onenand_base.c

View file

1

drivers/mtd/onenand/onenand_bbt.c

View file

21

drivers/mtd/onenand/samsung.c

View file

18

drivers/mtd/redboot.c

View file

2

drivers/mtd/rfd_ftl.c

View file

2

drivers/mtd/ssfdc.c

View file

9

drivers/mtd/tests/mtd_pagetest.c

View file

1

fs/jffs2/background.c

View file

1

fs/jffs2/build.c

View file

5

fs/jffs2/compr.c

View file

1

fs/jffs2/compr.h

View file

1

fs/jffs2/compr_lzo.c

View file

1

fs/jffs2/compr_rtime.c

View file

1

fs/jffs2/compr_rubin.c

View file

1

fs/jffs2/compr_zlib.c

View file

1

fs/jffs2/debug.c

View file

1

fs/jffs2/debug.h

View file

1

fs/jffs2/dir.c

View file

1

fs/jffs2/erase.c

View file

1

fs/jffs2/file.c

View file

1

fs/jffs2/fs.c

View file

1

fs/jffs2/gc.c

View file

1

fs/jffs2/ioctl.c

View file

1

fs/jffs2/jffs2_fs_i.h

View file

1

fs/jffs2/jffs2_fs_sb.h

View file

1

fs/jffs2/nodelist.h

View file

3

include/linux/jffs2.h

View file

24

include/linux/mtd/bbm.h

View file

16

include/linux/mtd/blktrans.h

View file

20

include/linux/mtd/cfi.h

View file

19

include/linux/mtd/cfi_endian.h

View file

10

include/linux/mtd/compatmac.h

View file

17

include/linux/mtd/concat.h

View file

23

include/linux/mtd/doc2000.h

View file

21

include/linux/mtd/flashchip.h

View file

19

include/linux/mtd/gen_probe.h

View file

19

include/linux/mtd/map.h

View file

19

include/linux/mtd/mtd.h

View file

8

include/linux/mtd/nand.h

View file

4

include/linux/mtd/nand_ecc.h

View file

Some files were not shown because too many files have changed in this diff Show more