kevin/linux
1
Fork 0
Code
d923738075
linux/arch/arm/plat-mxc/include/mach
History
Linus Torvalds 60d9aa758c Merge git://git.infradead.org/mtd-2.6 
* git://git.infradead.org/mtd-2.6: (90 commits)
  jffs2: Fix long-standing bug with symlink garbage collection.
  mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
  mtd: cfi_cmdset_0002, fix lock imbalance
  Revert "mtd: move mxcnd_remove to .exit.text"
  mtd: m25p80: add support for Macronix MX25L4005A
  kmsg_dump: fix build for CONFIG_PRINTK=n
  mtd: nandsim: add support for 4KiB pages
  mtd: mtdoops: refactor as a kmsg_dumper
  mtd: mtdoops: make record size configurable
  mtd: mtdoops: limit the maximum mtd partition size
  mtd: mtdoops: keep track of used/unused pages in an array
  mtd: mtdoops: several minor cleanups
  core: Add kernel message dumper to call on oopses and panics
  mtd: add ARM pismo support
  mtd: pxa3xx_nand: Fix PIO data transfer
  mtd: nand: fix multi-chip suspend problem
  mtd: add support for switching old SST chips into QRY mode
  mtd: fix M29W800D dev_id and uaddr
  mtd: don't use PF_MEMALLOC
  mtd: Add bad block table overrides to Davinci NAND driver
  ...

Fixed up conflicts (mostly trivial) in
	drivers/mtd/devices/m25p80.c
	drivers/mtd/maps/pcmciamtd.c
	drivers/mtd/nand/pxa3xx_nand.c
	kernel/printk.c
2009-12-16 10:23:43 -08:00
..
audmux.h MXC: Add a digital audio multiplexer driver 2009-11-14 10:30:39 +01:00
board-armadillo5x0.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-eukrea_cpuimx27.h Add support for Eukrea's MBIMX27 2009-08-07 12:11:12 +02:00
board-kzmarm11.h Add KZM-ARM11-01 support 2009-11-27 09:17:00 +01:00
board-mx21ads.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-mx27ads.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-mx27lite.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-mx27pdk.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-mx31ads.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-mx31lilly.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-mx31lite.h ARM: MX3: modularize 'mx31lite' code 2009-11-19 17:11:01 +01:00
board-mx31moboard.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-mx31pdk.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-mx35pdk.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-pcm037.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-pcm038.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-pcm043.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
board-qong.h MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR 2009-08-07 12:10:52 +02:00
clkdev.h
clock.h
common.h MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
debug-macro.S MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
dma-mx1-mx2.h mxc: mx1/mx2 DMA: add a possibility to create an endless DMA transfer 2009-11-24 08:40:14 +01:00
entry-macro.S MXC: use variable for irq controller base in entry-macro.S 2009-08-14 12:40:39 +02:00
gpio.h mxc: emulate GPIO interrupt on both-edges 2009-05-07 16:16:06 +02:00
hardware.h MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
i2c.h
iim.h
imx-uart.h Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-06-14 13:42:43 -07:00
imxfb.h imxfb: Add support for multiple displays 2009-08-07 12:10:56 +02:00
io.h
iomux-mx1.h
iomux-mx2x.h
iomux-mx3.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
iomux-mx21.h
iomux-mx25.h i.MX25 iomux definitions (corrected version) 2009-08-14 12:40:45 +02:00
iomux-mx27.h
iomux-mx35.h MX35: Add iomux pin defintions 2009-05-07 16:15:03 +02:00
iomux-mxc91231.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
iomux-v3.h mxc: iomux v3: remove resource handling 2009-11-24 08:39:43 +01:00
iomux.h mx27: mxt_td60: Add support to SD/MMC 2009-12-02 12:06:14 +01:00
ipu.h
irqs.h MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
memory.h MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
mmc.h
mtd-xip.h
mx1_camera.h
mx1.h MXC gpio interrupt support: move register definitions to .c file 2009-08-07 12:11:10 +02:00
mx2x.h ARM: fix "offest" -> "offset" typo 2009-11-26 11:55:19 +00:00
mx3_camera.h
mx3fb.h
mx3x.h ARM: MX3: fix CPU revision number detection 2009-11-23 11:51:18 +01:00
mx21.h imx: copy constants from mx2x.h to mx21.h using the appropriate namespace 2009-11-18 10:41:38 +01:00
mx25.h imx: reformat mx25.h to match the other platform includes 2009-11-18 10:41:27 +01:00
mx27.h imx: copy constants from mx2x.h to mx27.h using the appropriate namespace 2009-11-18 10:41:44 +01:00
mx31.h imx: copy constants from mx3x.h to mx31.h using the appropriate namespace 2009-11-18 10:41:55 +01:00
mx35.h imx: copy constants from mx3x.h to mx35.h using the appropriate namespace 2009-11-18 10:42:00 +01:00
mxc91231.h MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
mxc_ehci.h USB: Add EHCI support for MX27 and MX31 based boards 2009-12-11 11:55:18 -08:00
mxc_nand.h mxc_nand: Allow flash based bbt 2009-11-12 08:33:32 +01:00
mxc.h MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
spi.h spi: add SPI driver for most known i.MX SoCs 2009-09-23 07:39:43 -07:00
system.h MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
timex.h MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
ulpi.h MXC: Add support for ULPI Viewports 2009-11-14 10:29:15 +01:00
uncompress.h mx27: Add basic support for Maxtrack i-MXT TD60 2009-11-27 09:01:56 +01:00
usb.h imx: exit functions can/should be void 2009-05-07 16:15:58 +02:00
vmalloc.h