hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/arch/arm/mach-s5pc100/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
..
clkdev.h ARM: SAMSUNG: Added mach/clkdev.h 2011-07-21 02:04:14 +09: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 ARM: S5PC100: DMA: Add platform devices for PL330 DMACs 2010-05-23 16:26:56 +01:00
entry-macro.S ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardware.h ARM: S5PC100: Kconfigs and Makefiles 2009-08-16 23:35:19 +01:00
io.h ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx 2010-02-24 01:52:06 +00:00
irqs.h ARM: S5PC100: Change I2C2 and I2C3 IRQ names 2010-10-25 16:03:12 +09:00
map.h ARM: S5PC100: Clenaup map.h file 2011-02-17 12:52:52 +09:00
pwm-clock.h ARM: S5PC100: IRQ and timer 2009-08-16 23:25:00 +01:00
regs-clock.h ARM: S5PC100: Add support for Compact Flash driver on SMDKC100 2010-08-05 18:30:50 +09:00
regs-gpio.h ARM: S5PC100: Cleanup the GPIOlib code 2010-10-25 16:02:15 +09:00
regs-irq.h ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
spi-clocks.h ARM: S5PC100: Define SPI platform devices 2010-05-20 19:31:09 +09:00
system.h ARM: S5P: Add Support common arch_reset() for S5P 2010-08-05 18:30:22 +09:00
tick.h ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
timex.h ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx 2010-02-24 01:52:06 +00:00
uncompress.h ARM: S5PC100: CPU initialization 2009-08-16 23:24:58 +01:00
vmalloc.h ARM: S5P: Change VMALLOC_END to use more vmalloc()/ioremap() area 2010-10-25 16:11:50 +09:00