iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6a550b99a0
linux/arch/arm/mach-w90x900/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
..
entry-macro.S
fb.h NUC900 LCD Controller Driver 2010-03-12 15:52:34 -08:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardware.h
i2c.h i2c/nuc900: add i2c driver support for nuc900 2010-08-11 00:34:38 +01:00
io.h
irqs.h [ARM] 5494/1: Add w90p910 irq number define 2009-05-07 15:24:17 +01:00
map.h [ARM] 5493/1: Add w90p910 IC interface controller regester map 2009-05-07 15:24:16 +01:00
mfp.h ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 2010-05-24 22:25:34 +01:00
nuc900_spi.h ARM: NUC900: Add spi driver support for nuc900 2009-12-13 00:58:00 -07:00
regs-clock.h ARM: 5634/1: Add static setting cpu frequence for w90p910 platform 2009-08-01 16:23:57 +01:00
regs-ebi.h ARM: 5634/1: Add static setting cpu frequence for w90p910 platform 2009-08-01 16:23:57 +01:00
regs-gcr.h ARM: 6274/1: add global control registers definition header file for nuc900 2010-07-29 14:03:49 +01:00
regs-irq.h
regs-ldm.h NUC900 LCD Controller Driver 2010-03-12 15:52:34 -08:00
regs-serial.h
regs-timer.h
regs-usb.h [ARM] 5499/1: Add Usb register controller header file dfine 2009-05-07 15:24:21 +01:00
system.h ARM: 5864/1: Implement arch_reset() in NUC900 2010-01-05 20:52:45 +00:00
timex.h
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00
w90p910_keypad.h Input: w90p910_keypad - adjust to use definitions from matrix_keypad.h 2009-08-09 21:24:26 -07:00