kevin/linux
1
Fork 0
Code
9e9074160f
linux/arch/arm/mach-s3c64xx
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
..
include/mach Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
clock.c ARM: S3C64XX: Add clkdev support 2011-07-20 19:11:30 +09:00
cpu.c ARM: mach-s3c64xx: Setup consistent dma size at boot time 2011-08-22 12:00:10 +00:00
dev-audio.c
dev-onenand1.c ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND 2011-07-21 02:11:21 +09:00
dev-spi.c ARM: SAMSUNG: Add tx_st_done variable 2011-07-06 15:03:08 +09:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
dma.c ARM: SAMSUNG: DMA Cleanup as per sparse 2011-07-16 15:50:19 +09:00
gpiolib.c
irq-eint.c
irq-pm.c
irq.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
Kconfig Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:13:04 -07:00
mach-anw6410.c ARM: mach-s3c64xx: convert boot_params to atag_offset 2011-08-21 17:15:11 -04:00
mach-crag6410.c ARM: mach-s3c64xx: convert boot_params to atag_offset 2011-08-21 17:15:11 -04:00
mach-hmt.c ARM: mach-s3c64xx: convert boot_params to atag_offset 2011-08-21 17:15:11 -04:00
mach-mini6410.c ARM: mach-s3c64xx: convert boot_params to atag_offset 2011-08-21 17:15:11 -04:00
mach-ncp.c ARM: mach-s3c64xx: convert boot_params to atag_offset 2011-08-21 17:15:11 -04:00
mach-real6410.c ARM: mach-s3c64xx: convert boot_params to atag_offset 2011-08-21 17:15:11 -04:00
mach-smartq5.c ARM: mach-s3c64xx: convert boot_params to atag_offset 2011-08-21 17:15:11 -04:00
mach-smartq7.c ARM: mach-s3c64xx: convert boot_params to atag_offset 2011-08-21 17:15:11 -04:00
mach-smartq.c
mach-smartq.h
mach-smdk6400.c ARM: mach-s3c64xx: convert boot_params to atag_offset 2011-08-21 17:15:11 -04:00
mach-smdk6410.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
Makefile Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:13:04 -07:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: S3C64XX: Fix build break in PM debug 2011-08-19 20:57:36 +09:00
s3c6400.c
s3c6410.c
setup-fb-24bpp.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
setup-i2c0.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-i2c1.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-ide.c
setup-keypad.c
setup-sdhci-gpio.c
setup-sdhci.c
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00