OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/plat-mxc/include/mach
History
Linus Torvalds 1fdb24e969 Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
  ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
  ARM: gic, local timers: use the request_percpu_irq() interface
  ARM: gic: consolidate PPI handling
  ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
  ARM: mach-s5p64x0: remove mach/memory.h
  ARM: mach-s3c64xx: remove mach/memory.h
  ARM: plat-mxc: remove mach/memory.h
  ARM: mach-prima2: remove mach/memory.h
  ARM: mach-zynq: remove mach/memory.h
  ARM: mach-bcmring: remove mach/memory.h
  ARM: mach-davinci: remove mach/memory.h
  ARM: mach-pxa: remove mach/memory.h
  ARM: mach-ixp4xx: remove mach/memory.h
  ARM: mach-h720x: remove mach/memory.h
  ARM: mach-vt8500: remove mach/memory.h
  ARM: mach-s5pc100: remove mach/memory.h
  ARM: mach-tegra: remove mach/memory.h
  ARM: plat-tcc: remove mach/memory.h
  ARM: mach-mmp: remove mach/memory.h
  ARM: mach-cns3xxx: remove mach/memory.h
  ...

Fix up mostly pretty trivial conflicts in:
 - arch/arm/Kconfig
 - arch/arm/include/asm/localtimer.h
 - arch/arm/kernel/Makefile
 - arch/arm/mach-shmobile/board-ap4evb.c
 - arch/arm/mach-u300/core.c
 - arch/arm/mm/dma-mapping.c
 - arch/arm/mm/proc-v7.S
 - arch/arm/plat-omap/Kconfig
largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
 		2011-10-28 12:02:27 -07:00
..
3ds_debugboard.h mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
audmux.h MX51: Add AUDMUX ports definitions 2011-03-23 15:08:13 +01:00
board-mx31ads.h Fixing ethernet driver compilation error for i.MX31 ADS board 2010-10-19 18:45:01 +02:00
board-mx31lilly.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31lite.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31moboard.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-pcm038.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
clock.h arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block 2010-02-24 10:07:03 +01:00
common.h gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
devices-common.h ARM: mxc: convert device creation to use platform_device_register_full 2011-08-26 11:31:10 -07:00
dma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
entry-macro.S ARM: entry: remove unused irq_prio_table macro 2011-06-28 10:34:58 +01:00
esdhc.h mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea-baseboards.h mx5: add cpuimx51sd module and its baseboard 2010-10-19 18:45:00 +02:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardware.h ARM i.MX: remove SoC defines around header includes 2011-07-07 09:59:58 +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 ARM: imx: dynamically register imx-fb devices 2010-11-17 10:01:27 +01:00
io.h ARM: mx3: make ioremap quirk ready for multi-SoC kernels 2011-05-19 13:11:32 +02:00
iomux-mx1.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx2x.h mx2/iomux: Set direction for CSPI2 pins 2011-03-25 08:21:34 +01:00
iomux-mx3.h ARM: iomux-imx31: allow pin_list to be const 2011-03-07 19:29:28 +01:00
iomux-mx21.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx25.h ARM: mx25: Fix typo on CAN1_RX pad setting 2011-07-15 10:11:28 +02:00
iomux-mx27.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx35.h ARM: imx35: fix ATA_DATA3 pad control address 2011-03-07 19:29:09 +01:00
iomux-mx50.h ARM: imx50: correct iomux-mx50.h wrong daisy chain settings 2011-02-18 11:01:34 +01:00
iomux-mx51.h mx51 enchance the sd/mmc HW timing compatibility on mx51 boards. 2011-03-10 14:22:18 +01:00
iomux-mx53.h Merge commit 'v3.1-rc1' into imx-fixes 2011-08-08 08:22:41 +02:00
iomux-v1.h ARM i.MX: get rid of wrong MXC_INTERNAL_IRQ usage 2011-07-07 10:00:00 +02:00
iomux-v3.h MXC: iomux-v3: correct NO_PAD_CTRL definition 2011-07-07 09:07:41 +02:00
ipu.h
…
iram.h ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irqs.h ARM: mxc: use ARCH_NR_GPIOS to define gpio number 2011-07-08 12:38:18 -06:00
mmc.h mxcmmc: add card detect through DAT3 possibility 2010-07-26 14:17:46 +02:00
mx1.h MX1: Add structure, registration functions for framebuffer and rename LCDC INT 2011-03-07 19:29:36 +01:00
mx1_camera.h
…
mx2_cam.h mx2_camera: Add soc_camera support for i.MX25/i.MX27 2010-07-28 09:28:36 +02:00
mx2x.h ARM: imx: remove deprecated symbols as all users are gone now 2010-11-17 08:58:12 +01:00
mx3_camera.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
mx3fb.h
…
mx3x.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx21-usbhost.h USB: MXC: Add i.MX21 specific USB host controller driver. 2010-03-02 14:52:55 -08:00
mx21.h ARM: mx25: move registration of gpios to plat-mxc/gpio.c 2010-11-17 10:01:38 +01:00
mx25.h ARM: mx25: fix offset for usb host controller 2010-12-03 11:05:10 +01:00
mx27.h ARM: mx27: fix gpt4/5 base address 2011-05-19 13:11:09 +02:00
mx31.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx35.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx50.h ARM: mx50: Add support to get the silicon revision 2011-03-23 15:08:15 +01:00
mx51.h ARM: mx51: Print silicon revision on boot 2011-03-23 15:07:47 +01:00
mx53.h ARM: mx53: Add SSI suport 2011-07-07 10:01:13 +02:00
mxc.h ARM i.MX mxc.h: use CONFIG_SOC_* instead of CONFIG_ARCH_* 2011-07-07 09:59:59 +02:00
mxc_ehci.h ARM i.MX ehci: do ehci init in board specific functions 2011-02-11 08:40:45 +01:00
mxc_nand.h Fix common misspellings 2011-03-31 11:26:23 -03:00
sdma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
spi.h spi: add SPI driver for most known i.MX SoCs 2009-09-23 07:39:43 -07:00
ssi.h ASoC: imx-ssi.c: add new choices to platform configuration 2010-06-03 19:00:16 +01:00
system.h ARM: remove support for mxc91231 2011-05-19 13:11:28 +02:00
timex.h ARM i.MX: define CLOCK_TICK_RATE to bogus value 2011-07-07 09:59:58 +02:00
ulpi.h ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
uncompress.h ARM: mach-mx5/mx53_ard: Add support for i.MX53 ARD board 2011-07-07 10:01:07 +02:00
usb.h
…
vmalloc.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00