2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 19:53:59 +08:00
linux-next/drivers/mtd/maps
Linus Torvalds 22ae77bc7a Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (53 commits)
  [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
  [MTD] [NOR] Fixup for Numonyx M29W128 chips
  [MTD] mtdpart: Make ecc_stats more realistic.
  powerpc/85xx: TQM8548: Update DTS file for multi-chip support
  powerpc: NAND: FSL UPM: document new bindings
  [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays
  [MTD] [NAND] FSL-UPM: add multi chip support
  [MTD] [NOR] Add device parent info to physmap_of
  [MTD] [NAND] Add support for NAND on the Socrates board
  [MTD] [NAND] Add support for 4KiB pages.
  [MTD] sysfs support should not depend on CONFIG_PROC_FS
  [MTD] [NAND] Add parent info for CAFÉ controller
  [MTD] support driver model updates
  [MTD] driver model updates (part 2)
  [MTD] driver model updates
  [MTD] [NAND] move gen_nand's probe function to .devinit.text
  [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text
  [MTD] fix use after free in register_mtd_blktrans
  [MTD] [MAPS] Drop now unused sharpsl-flash map
  [MTD] ofpart: Check name property to determine partition nodes.
  ...

Manually fix trivial conflict in drivers/mtd/maps/Makefile
2009-04-06 14:56:26 -07:00
..
alchemy-flash.c [MTD] Make alchemy_mtd_init function static 2008-12-10 13:01:10 +00:00
amd76xrom.c [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00:00
autcpu12-nvram.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
bfin-async-flash.c [MTD] [MAPS] blackfin: fix memory leak in error path 2009-02-14 08:07:05 +00:00
cdb89712.c [ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants 2008-11-13 15:05:03 +00:00
ceiva.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
cfi_flagadm.c [MTD] Make init_flagadm function static 2008-12-10 13:01:00 +00:00
ck804xrom.c [MTD] [MAPS] Remove MODULE_DEVICE_TABLE() from ck804rom driver. 2009-02-27 04:52:45 +09:00
dbox2-flash.c [MTD] Make init_dbox2_flash static 2008-12-10 13:01:02 +00:00
dc21285.c [ARM] netwinder: clean up GPIO naming 2008-12-13 09:12:07 +00:00
dilnetpc.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
dmv182.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
edb7312.c [MTD] Make the init_edb7312nor function static 2008-12-10 13:00:51 +00:00
esb2rom.c [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00:00
fortunet.c [MTD] Make init_fortunet function static 2008-12-10 13:01:13 +00:00
h720x-flash.c [MTD] Make h720x_mtd_init function static 2008-12-10 13:01:23 +00:00
ichxrom.c [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00:00
impa7.c [MTD] Make init_impa7 static 2008-12-10 13:01:32 +00:00
integrator-flash.c [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h 2009-03-25 10:21:35 +00:00
intel_vr_nor.c [MTD] map driver for NOR flash on the Intel Vermilion Range chipset 2007-09-23 18:51:25 +01:00
ipaq-flash.c [MTD] Make ipaq_mtd_init function static 2008-12-10 13:01:06 +00:00
ixp4xx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2009-01-05 10:50:33 +01:00
ixp2000.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2009-01-05 10:50:33 +01:00
Kconfig Merge git://git.infradead.org/mtd-2.6 2009-04-06 14:56:26 -07:00
l440gx.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
Makefile Merge git://git.infradead.org/mtd-2.6 2009-04-06 14:56:26 -07:00
map_funcs.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
mbx860.c [MTD] Make init_mbx function static 2008-12-10 13:01:20 +00:00
netsc520.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
nettel.c [MTD] [MAPS] Fix printk format warning in nettel.c 2009-01-09 14:17:50 +00:00
octagon-5066.c [MTD] Make init_oct5066 function static 2008-12-10 13:00:56 +00:00
omap_nor.c [MTD] support driver model updates 2009-04-04 14:32:59 +01:00
pci.c [MTD] [MAPS] Remove unused variable after ROM API cleanup. 2008-10-14 11:00:51 +01:00
pcmciamtd.c pcmcia: remove unused argument to pcmcia_parse_tuple() 2008-08-31 15:50:33 +02:00
physmap_of.c [MTD] [NOR] Add device parent info to physmap_of 2009-04-06 07:15:42 -07:00
physmap.c [MTD] support driver model updates 2009-04-04 14:32:59 +01:00
plat-ram.c [MTD] support driver model updates 2009-04-04 14:32:59 +01:00
pmcmsp-flash.c [MTD] Make init_msp_flash function static 2008-12-10 13:01:26 +00:00
pmcmsp-ramroot.c [MTD] Remove references to ROOT_DEV from map drivers. 2007-06-28 20:13:27 +01:00
pxa2xx-flash.c [ARM] fix build-breaking 7a192ec commit 2009-04-02 23:23:43 +01:00
rbtx4939-flash.c [MTD] RBTX4939 map driver 2009-03-20 18:11:20 +00:00
redwood.c [MTD] Make init_redwood_flash function static 2008-12-10 13:01:29 +00:00
rpxlite.c [MTD] Make init_rpxlite function static 2008-12-10 13:00:43 +00:00
sa1100-flash.c Merge git://git.infradead.org/mtd-2.6 2009-04-06 14:56:26 -07:00
sbc8240.c [MTD] Make init_sbc8240_mtd function static 2008-12-10 13:00:23 +00:00
sbc_gxx.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
sc520cdp.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
scb2_flash.c [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00:00
scx200_docflash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
solutionengine.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
sun_uflash.c sparc: Annotate of_device_id arrays with const or __initdata. 2008-08-31 01:23:17 -07:00
tqm8xxl.c [MTD] Make init_tqm_mtd function static 2008-12-10 13:00:37 +00:00
ts5500_flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
tsunami_flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
uclinux.c [MTD] Make uclinux_mtd_cleanup and uclinux_mtd_init static 2008-12-10 13:00:33 +00:00
vmax301.c [MTD] Make the function init_vmax301 static 2008-12-10 13:01:17 +00:00
vmu-flash.c mtd: flash mapping support for Dreamcast VMU. 2009-03-10 18:03:02 +09:00
wr_sbc82xx_flash.c [MTD] Make init_sbc82xx_flash function static 2008-12-10 13:00:47 +00:00