openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/mach-ep93xx/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
..
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
dma.h ep93xx: remove the old M2P DMA code 2011-06-08 15:46:05 -06:00
entry-macro.S [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
ep93xx-regs.h gpio/ep93xx: Add missing EP93XX_GPIO_PHYS_BASE define 2011-06-10 23:27:06 -06:00
ep93xx_keypad.h Input: ep93xx_keypad - cleanup and use matrix_keypad helpers 2010-01-13 00:37:16 -08:00
ep93xx_spi.h spi/ep93xx: add DMA support 2011-06-08 15:46:12 -06:00
fb.h ep93xx video driver platform support 2009-09-23 07:39:51 -07:00
gpio-ep93xx.h ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics 2011-10-01 23:37:34 +01:00
gpio.h ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h> 2011-10-17 23:00:03 +01:00
hardware.h ARM: pci: make pcibios_assign_all_busses use pci_has_flag 2011-07-12 11:19:28 -05:00
io.h ARM: 5790/1: ep93xx: add missing newline between file header and code 2009-11-24 10:04:17 +00:00
irqs.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
platform.h ARM: ep93xx: add AC97 platform support 2010-10-15 11:54:53 +01:00
system.h [ARM] 5577/2: ep93xx: syscon locked register functions 2009-07-09 16:10:51 +01:00
timex.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
ts72xx.h ARM: 6967/1: ep93xx: ts72xx: fix board model detection 2011-08-15 11:58:59 +01:00
uncompress.h [ARM] 5276/1: ep93xx: allow selecting UART for early kernel messages 2008-10-03 11:03:39 +01:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00