Commit be967b7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.infradead.org/mtd-2.6: (199 commits)
  [MTD] NAND: Fix breakage all over the place
  [PATCH] NAND: fix remaining OOB length calculation
  [MTD] NAND Fixup NDFC merge brokeness
  [MTD NAND] S3C2410 driver cleanup
  [MTD NAND] s3c24x0 board: Fix clock handling, ensure proper initialisation.
  [JFFS2] Check CRC32 on dirent and data nodes each time they're read
  [JFFS2] When retiring nextblock, allocate a node_ref for the wasted space
  [JFFS2] Mark XATTR support as experimental, for now
  [JFFS2] Don't trust node headers before the CRC is checked.
  [MTD] Restore MTD_ROM and MTD_RAM types
  [MTD] assume mtd->writesize is 1 for NOR flashes
  [MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles
  [MTD] Prepare physmap for 64-bit-resources
  [JFFS2] Fix more breakage caused by janitorial meddling.
  [JFFS2] Remove stray __exit from jffs2_compressors_exit()
  [MTD] Allow alternate JFFS2 mount variant for root filesystem.
  [MTD] Disconnect struct mtd_info from ABI
  [MTD] replace MTD_RAM with MTD_GENERIC_TYPE
  [MTD] replace MTD_ROM with MTD_GENERIC_TYPE
  [MTD] remove a forgotten MTD_XIP
  ...
parents eef11427 7bc3312b

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1843,12 +1843,12 @@ S: linux-scsi@vger.kernel.org 
W:     http://megaraid.lsilogic.com

S:     Maintained



MEMORY TECHNOLOGY DEVICES

MEMORY TECHNOLOGY DEVICES (MTD)

P:	David Woodhouse

M:	dwmw2@infradead.org

W:	http://www.linux-mtd.infradead.org/

L:	linux-mtd@lists.infradead.org

T:	git kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6.git

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

S:	Maintained



MICROTEK X6 SCANNER

drivers/mtd/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ config MTD_REDBOOT_DIRECTORY_BLOCK 
	  option.



	  The option specifies which Flash sectors holds the RedBoot

	  partition table.  A zero or positive value gives an absolete

	  partition table.  A zero or positive value gives an absolute

	  erase block number. A negative value specifies a number of

	  sectors before the end of the device.
@@ -103,7 +103,7 @@ config MTD_CMDLINE_PARTS 
	bool "Command line partition table parsing"

	depends on MTD_PARTITIONS = "y"

	---help---

	  Allow generic configuration of the MTD paritition tables via the kernel

	  Allow generic configuration of the MTD partition tables via the kernel

	  command line. Multiple flash resources are supported for hardware where

	  different kinds of flash memory are available.

drivers/mtd/chips/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ config MTD_JEDECPROBE 


config MTD_GEN_PROBE

	tristate

	select OBSOLETE_INTERMODULE



config MTD_CFI_ADV_OPTIONS

	bool "Flash chip driver advanced configuration options"

drivers/mtd/chips/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -3,13 +3,6 @@ 
#

# $Id: Makefile.common,v 1.5 2005/11/07 11:14:22 gleixner Exp $



#                       *** BIG UGLY NOTE ***

#

# The removal of get_module_symbol() and replacement with

# inter_module_register() et al has introduced a link order dependency

# here where previously there was none.  We now have to ensure that

# the CFI command set drivers are linked before gen_probe.o



obj-$(CONFIG_MTD)		+= chipreg.o

obj-$(CONFIG_MTD_AMDSTD)	+= amd_flash.o

obj-$(CONFIG_MTD_CFI)		+= cfi_probe.o

drivers/mtd/chips/amd_flash.c

+1 −7
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ struct amd_flash_private { 
	int interleave;

	int numchips;

	unsigned long chipshift;

//	const char *im_name;

	struct flchip chips[0];

};
@@ -131,12 +130,6 @@ static struct mtd_chip_driver amd_flash_chipdrv = { 
	.module = THIS_MODULE

};







static const char im_name[] = "amd_flash";







static inline __u32 wide_read(struct map_info *map, __u32 addr)

{

	if (map->buswidth == 1) {
@@ -737,6 +730,7 @@ static struct mtd_info *amd_flash_probe(struct map_info *map) 
		offset += dev_size;

	}

	mtd->type = MTD_NORFLASH;

	mtd->writesize = 1;

	mtd->flags = MTD_CAP_NORFLASH;

	mtd->name = map->name;

	mtd->erase = amd_flash_erase;

CRA Git | Maintained and supported by SUSTech CRA and CCSE