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-shmobile/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: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
common.h ARM: mach-shmobile: sh7372 A3SM support 2011-09-25 23:20:49 +02:00
dma.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
entry-macro.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardware.h ARM: mach-shmobile: Rely on run-time IRQ handlers 2011-01-07 10:43:02 +09:00
head-ap4evb.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
head-mackerel.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
io.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
irqs.h ARM: mach-shmobile: Bump up NR_IRQS to 1024 2010-12-21 00:27:55 +09:00
memory.h ARM: mach-shmobile: Setup consistent dma size at boot time 2011-08-22 12:00:12 +00:00
mmc-ap4eb.h mmc, ARM: Rename SuperH Mobile ARM zboot helpers 2011-03-25 01:24:57 +09:00
mmc-mackerel.h mmc, ARM: Rename SuperH Mobile ARM zboot helpers 2011-03-25 01:24:57 +09:00
mmc.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00
sdhi-sh7372.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sdhi.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sh73a0.h ARM: mach-shmobile: sh73a0: mark DMA slave ID 0 as invalid 2011-05-25 11:37:24 +09:00
sh7367.h ARM: mach-shmobile: sh7367 and G3EVM pinmux support 2010-02-12 14:10:47 +09:00
sh7372.h ARM: mach-shmobile: sh7372 A4R support (v4) 2011-10-22 00:20:12 +02:00
sh7377.h ARM: mach-shmobile: sh7377 and G4EVM pinmux support 2010-02-15 13:43:37 +09:00
system.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
timex.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
uncompress.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
vmalloc.h ARM: mach-shmobile: fix compile warning in mm/init.c 2010-12-17 19:41:13 +09:00
zboot.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00
zboot_macros.h ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM 2010-12-05 08:40:21 +00:00