mirror of https://gitee.com/openkylin/linux.git
1fdb24e969
* '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. |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
board-cpuimx51.c | ||
board-cpuimx51sd.c | ||
board-mx50_rdp.c | ||
board-mx51_3ds.c | ||
board-mx51_babbage.c | ||
board-mx51_efikamx.c | ||
board-mx51_efikasb.c | ||
board-mx53_ard.c | ||
board-mx53_evk.c | ||
board-mx53_loco.c | ||
board-mx53_smd.c | ||
clock-mx51-mx53.c | ||
cpu.c | ||
cpu_op-mx51.c | ||
cpu_op-mx51.h | ||
crm_regs.h | ||
devices-imx50.h | ||
devices-imx51.h | ||
devices-imx53.h | ||
devices.c | ||
devices.h | ||
efika.h | ||
ehci.c | ||
eukrea_mbimx51-baseboard.c | ||
eukrea_mbimxsd-baseboard.c | ||
mm-mx50.c | ||
mm.c | ||
mx51_efika.c | ||
pm-imx5.c | ||
system.c |