leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
eca55f4d9c
linux/arch/arm/mach-s3c2410/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
..
anubis-cpld.h
anubis-irq.h
anubis-map.h
bast-cpld.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
bast-irq.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
bast-map.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
bast-pmu.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00: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 Fix common misspellings 2011-03-31 11:26:23 -03:00
entry-macro.S
fb.h
gpio-fns.h ARM: mach-s3c2400: delete 2011-07-18 10:59:26 -04:00
gpio-nrs.h ARM: S3C24XX: Add note on GPIO bank sizes 2010-05-18 19:06:35 +09:00
gpio-track.h ARM: S3C24XX: Remove macros mapping GPIO number to base 2010-05-18 19:06:34 +09:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
h1940-latch.h ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
h1940.h ARM: S3C2410: H1940: Use leds-gpio driver for LEDs managing 2011-03-20 23:14:55 +00:00
hardware.h [ARM] S3C24XX: GPIO: Move gpio functions out of <mach/hardware.h> 2009-05-18 16:25:40 +01:00
idle.h
io.h ARM: io: s3c2410: remove ioaddr() 2011-08-17 08:44:15 +01:00
irqs.h ARM: S3C24XX: Add address map and clock definitions for HSMMC0 2011-01-06 14:09:18 +09:00
leds-gpio.h
map.h ARM: S3C24XX: Add plaform device definition for USB High-Speed gadget controller. 2011-05-10 14:16:54 -07:00
osiris-cpld.h
osiris-map.h ARM: S3C: Fix Simtec copyright statements in Documentation/S3C24XX 2009-12-01 01:33:50 +00:00
otom-map.h
pm-core.h ARM: SAMSUNG: Add support for pre-sleep/post-restore gpio control 2011-07-20 23:13:20 +09:00
regs-clock.h ARM: S3C2416: Add basic clock support 2010-05-10 11:44:43 +09:00
regs-dsc.h ARM: S3C2416: Add S3C2416-specific registers definitions 2010-05-10 11:44:03 +09:00
regs-gpio.h ARM: mach-s3c2400: delete 2011-07-18 10:59:26 -04:00
regs-gpioj.h ARM: S3C24XX: Remove _INP macros in <mach/regs-gpioj.h> 2010-05-06 11:32:14 +09:00
regs-irq.h ARM: S3C2416: Add S3C2416-specific registers definitions 2010-05-10 11:44:03 +09:00
regs-lcd.h
regs-mem.h ARM: mach-s3c2400: delete 2011-07-18 10:59:26 -04:00
regs-power.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
regs-s3c2412-mem.h ARM: S3C2412: Update memory register mapping and definitions 2009-07-30 23:22:54 +01:00
regs-s3c2412.h
regs-s3c2416-mem.h ARM: S3C2416: Add S3C2416-specific registers definitions 2010-05-10 11:44:03 +09:00
regs-s3c2416.h ARM: S3C2416: Add S3C2416-specific registers definitions 2010-05-10 11:44:03 +09:00
regs-s3c2443-clock.h ARM: S3C2416: Add USB Phy register definitions 2011-05-10 14:16:54 -07:00
regs-sdi.h
reset.h
spi.h spi_s3c24xx: add FIQ pseudo-DMA support 2009-12-17 08:57:01 -07:00
system-reset.h [ARM] S3C: Move watchdog system reset to own file. 2009-05-17 23:30:45 +01:00
system.h [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
tick.h [ARM] S3C24XX: Split timer pending code out 2008-12-15 21:46:41 +00:00
timex.h ARM: SAMSUNG: Move include/mach files out of plat-s3c 2010-02-24 01:52:12 +00:00
uncompress.h ARM: S3C: Add S3C2416 detection to uncompress code 2010-05-06 11:37:17 +09:00
vmalloc.h ARM: S3C: Change VMALLOC_END to use more vmalloc()/ioremap() area 2010-10-25 16:11:44 +09:00
vr1000-cpld.h
vr1000-irq.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
vr1000-map.h