1
linux/arch/arm/mach-s3c64xx/include/mach
Linus Torvalds 636d17427b Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
  ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
  ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
  ARM: 6322/1: imx/pca100: Fix name of spi platform data
  ARM: 6321/1: fix syntax error in main Kconfig file
  ARM: 6297/1: move U300 timer to dynamic clock lookup
  ARM: 6296/1: clock U300 intcon and timer properly
  ARM: 6295/1: fix U300 apb_pclk split
  ARM: 6306/1: fix inverted MMC card detect in U300
  ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
  ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
  ARM: 6292/1: coresight: add ETM management registers
  ARM: 6288/1: ftrace: document mcount formats
  ARM: 6287/1: ftrace: clean up mcount assembly indentation
  ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
  ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
  ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h>
  ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
  ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
  ARM: S5PV210: Override FIMC driver name on Aquila board
  ARM: S5PC100: enable FIMC on SMDKC100
  ...

Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
different subsystem 'setname' calls, and trivial port types in
include/linux/serial_core.h
2010-08-11 09:13:19 -07:00
..
debug-macro.S ARM: SAMSUNG: Fixup commit 4e6d488af3 2010-03-15 23:11:41 +00:00
dma.h ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed 2010-02-21 23:10:35 +00:00
entry-macro.S ARM: S3C64XX: Move IRQ support into mach-s3c64xx 2010-02-20 22:32:00 +00:00
gpio-bank-a.h
gpio-bank-b.h
gpio-bank-c.h
gpio-bank-d.h
gpio-bank-e.h
gpio-bank-f.h
gpio-bank-g.h
gpio-bank-h.h
gpio-bank-i.h
gpio-bank-j.h
gpio-bank-n.h
gpio-bank-o.h
gpio-bank-p.h
gpio-bank-q.h
gpio.h ARM: S3C64XX: Add initial support for board specific IRQs 2010-02-24 23:54:43 +00:00
hardware.h
io.h ARM: SAMSUNG: Move include/mach files out of plat-s3c 2010-02-24 01:52:12 +00:00
irqs.h ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
map.h ARM: S3C64XX: Add keypad device to the SMDK6410 board 2010-08-06 21:28:30 +09:00
memory.h
pll.h ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use 2010-05-10 11:44:37 +09:00
pm-core.h ARM: SAMSUNG: Move pm-core.h to machine directory 2010-02-20 22:34:03 +00:00
pwm-clock.h
regs-clock.h ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410 2010-08-05 18:32:50 +09:00
regs-fb.h s3c-fb: initial move to unifying the header files 2010-08-11 08:59:10 -07:00
regs-gpio-memport.h
regs-gpio.h
regs-irq.h
regs-modem.h
regs-srom.h
regs-sys.h
regs-syscon-power.h
s3c6400.h ARM: S3C64XX: Combine the clock init code 2010-02-20 22:34:02 +00:00
s3c6410.h ARM: S3C64XX: Move core support to mach-s3c64xx 2010-02-20 22:33:54 +00:00
spi-clocks.h ARM: S3C64XX: Move device and device setup into mach-s3c64xx 2010-02-20 22:32:01 +00:00
system.h
tick.h
timex.h ARM: SAMSUNG: Move include/mach files out of plat-s3c 2010-02-24 01:52:12 +00:00
uncompress.h
vmalloc.h ARM: SAMSUNG: Move include/mach files out of plat-s3c 2010-02-24 01:52:12 +00:00