Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/include/linux/mtd
History
Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.
2012-01-17 18:40:24 -08:00
..
bbm.h mtd: nand: improve comment on NAND_BBT_DYNAMIC_STRUCT 2011-09-11 15:01:57 +03:00
blktrans.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1 2011-03-25 17:41:20 +02:00
cfi.h mtd: cfi: Allow per-mapping CFI device endianness 2012-01-09 18:06:13 +00:00
cfi_endian.h mtd: cfi: Allow per-mapping CFI device endianness 2012-01-09 18:06:13 +00:00
concat.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
doc2000.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
flashchip.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
fsmc.h mtd: FSMC NAND fix obvious speling errors 2010-12-03 16:35:40 +00:00
ftl.h
gen_probe.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
gpmi-nand.h mtd: fix compile error for gpmi-nand 2011-12-23 21:33:15 +05:30
inftl.h mtd: inftl.h: fix spacing errors 2010-10-24 23:27:24 +01:00
latch-addr-flash.h mtd: NOR flash driver for OMAP-L137/AM17x 2011-03-11 14:22:47 +00:00
map.h mtd: map.h: fix arm cross-build failure 2012-01-09 18:24:34 +00:00
mtd.h mtd: do not use mtd->block_markbad directly 2012-01-09 18:26:26 +00:00
mtdram.h
nand-gpio.h
nand.h mtd: nand: add Macronix manufacturer 2012-01-09 17:59:33 +00:00
nand_bch.h mtd: nand: add software BCH ECC support 2011-03-11 17:49:08 +00:00
nand_ecc.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
ndfc.h
nftl.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
onenand.h mtd: OneNAND: Detect the correct NOP when 4KiB pagesize 2011-09-11 15:02:13 +03:00
onenand_regs.h OMAP: OneNAND: fix 104MHz support 2011-02-17 15:44:45 -08:00
partitions.h mtd: remove put_partition_parser() from public header 2011-09-11 15:02:13 +03:00
pfow.h
physmap.h mtd: maps: physmap: allow partition parsers for physmap_flash_data 2012-01-09 18:16:15 +00:00
pismo.h
plat-ram.h
pmc551.h
qinfo.h
sh_flctl.h mtd/nand/sh_flctl: Move function mtd_to_flctl to fix build failure 2010-05-12 23:24:23 +01:00
sharpsl.h
super.h convert get_sb_mtd() users to ->mount() 2010-10-29 04:16:26 -04:00
ubi.h UBI: clarify the volume notification types' doc 2011-06-23 17:40:07 +03:00
xip.h Fix common misspellings 2011-03-31 11:26:23 -03:00