Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Some manual fixups for clashing kfree() cleanups etc.
parents 5b2f7ffc c2965f11

drivers/mtd/Kconfig

+26 −14
Original line number Diff line number Diff line 
# $Id: Kconfig,v 1.7 2004/11/22 11:33:56 ijc Exp $

# $Id: Kconfig,v 1.11 2005/11/07 11:14:19 gleixner Exp $



menu "Memory Technology Devices (MTD)"
@@ -253,6 +253,16 @@ config INFTL 
	  permitted to copy, modify and distribute the code as you wish. Just

	  not use it.



config RFD_FTL

        tristate "Resident Flash Disk (Flash Translation Layer) support"

	depends on MTD

	---help---

	  This provides support for the flash translation layer known

	  as the Resident Flash Disk (RFD), as used by the Embedded BIOS

	  of General Software. There is a blurb at:



		http://www.gensw.com/pages/prod/bios/rfd.htm



source "drivers/mtd/chips/Kconfig"



source "drivers/mtd/maps/Kconfig"
@@ -261,5 +271,7 @@ source "drivers/mtd/devices/Kconfig" 


source "drivers/mtd/nand/Kconfig"



source "drivers/mtd/onenand/Kconfig"



endmenu

drivers/mtd/Makefile

+3 −2
Original line number Diff line number Diff line 
#

# Makefile for the memory technology device drivers.

#

# $Id: Makefile.common,v 1.5 2004/08/10 20:51:49 dwmw2 Exp $

# $Id: Makefile.common,v 1.7 2005/07/11 10:39:27 gleixner Exp $



# Core functionality.

mtd-y				:= mtdcore.o
@@ -20,8 +20,9 @@ obj-$(CONFIG_MTD_BLOCK_RO) += mtdblock_ro.o mtd_blkdevs.o 
obj-$(CONFIG_FTL)		+= ftl.o mtd_blkdevs.o

obj-$(CONFIG_NFTL)		+= nftl.o mtd_blkdevs.o

obj-$(CONFIG_INFTL)		+= inftl.o mtd_blkdevs.o

obj-$(CONFIG_RFD_FTL)		+= rfd_ftl.o mtd_blkdevs.o



nftl-objs		:= nftlcore.o nftlmount.o

inftl-objs		:= inftlcore.o inftlmount.o



obj-y		+= chips/ maps/ devices/ nand/
 
obj-y		+= chips/ maps/ devices/ nand/ onenand/

drivers/mtd/afs.c

+8 −8
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
   This is access code for flashes using ARM's flash partitioning

   standards.



   $Id: afs.c,v 1.13 2004/02/27 22:09:59 rmk Exp $

   $Id: afs.c,v 1.15 2005/11/07 11:14:19 gleixner Exp $



======================================================================*/

drivers/mtd/chips/Kconfig

+11 −11
Original line number Diff line number Diff line 
# drivers/mtd/chips/Kconfig

# $Id: Kconfig,v 1.15 2005/06/06 23:04:35 tpoynor Exp $

# $Id: Kconfig,v 1.18 2005/11/07 11:14:22 gleixner Exp $



menu "RAM/ROM/Flash chip drivers"

	depends on MTD!=n

drivers/mtd/chips/Makefile

+2 −2
Original line number Diff line number Diff line 
#

# linux/drivers/chips/Makefile

#

# $Id: Makefile.common,v 1.4 2004/07/12 16:07:30 dwmw2 Exp $

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



#                       *** BIG UGLY NOTE ***

#