leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
00cd117680
linux/arch/arm/mach-ux500
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
board-mop500-pins.c ARM: 7032/1: plat-nomadik: break out GPIO driver specifics 2011-08-22 09:12:53 +01:00
board-mop500-regulators.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
board-mop500-regulators.h mach-ux500: configure board for the TPS61052 regulator v2 2011-03-28 08:54:23 +02:00
board-mop500-sdi.c mach-ux500: Add SDI support for snowball board 2011-06-23 12:04:56 +02:00
board-mop500-stuib.c mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500-u8500uib.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-mop500-uib.c mach-x500: fix SECTION warnings in uib 2011-06-22 13:26:49 +02:00
board-mop500.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
board-mop500.h mach-ux500: Add SDI support for snowball board 2011-06-23 12:04:56 +02:00
board-u5500-sdi.c ARM: 7032/1: plat-nomadik: break out GPIO driver specifics 2011-08-22 09:12:53 +01:00
board-u5500.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
clock.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
clock.h ux500: add debugfs support for powerdebug 2010-12-20 13:32:45 +01:00
cpu-db5500.c ARM: 7032/1: plat-nomadik: break out GPIO driver specifics 2011-08-22 09:12:53 +01:00
cpu-db8500.c ARM: 7032/1: plat-nomadik: break out GPIO driver specifics 2011-08-22 09:12:53 +01:00
cpu.c mfd: add DB5500 PRCMU driver 2011-05-24 22:19:37 +02:00
devices-common.c ARM: 7032/1: plat-nomadik: break out GPIO driver specifics 2011-08-22 09:12:53 +01:00
devices-common.h ARM: 6830/1: mach-ux500: force PrimeCell revisions 2011-05-26 10:33:35 +01:00
devices-db5500.h ARM: 6830/1: mach-ux500: force PrimeCell revisions 2011-05-26 10:33:35 +01:00
devices-db8500.c mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
devices-db8500.h ARM: 6830/1: mach-ux500: force PrimeCell revisions 2011-05-26 10:33:35 +01:00
devices.c ux500: rework device registration 2010-12-08 13:14:06 +01:00
dma-db5500.c mach-ux500: add MUSB to db5500 devices 2011-03-14 14:05:12 +01:00
headsmp.S ARM: 6539/1: ux500: remove unnecessary barrier from the secondary startup 2010-12-24 09:50:26 +00:00
hotplug.c ARM: CPU hotplug: remove bug checks in platform_cpu_die() 2010-12-20 15:09:10 +00:00
id.c ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
Kconfig ARM: mach-ux500: enable fix for ARM errata 754322 2011-10-07 17:38:35 +02:00
localtimer.c ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime 2011-02-23 17:54:27 +00:00
Makefile mfd: update DB8500 PRCMU driver 2011-05-24 22:18:57 +02:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mbox-db5500.c treewide: Fix iomap resource size miscalculations 2011-04-10 17:01:04 +02:00
modem-irq-db5500.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
pins-db5500.h ARM: 6371/1: ux500: add DB5500 pins 2010-09-19 12:12:26 +01:00
pins-db8500.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2010-10-25 07:59:01 -07:00
platsmp.c ARM: smp: fix clipping of number of CPUs 2011-10-20 22:06:57 +01:00
ste-dma40-db5500.h ARM: 6372/1: ux500: add DB5500 DMA event lines 2010-09-19 12:12:27 +01:00
ste-dma40-db8500.h ARM: 6418/1: ux500: rename DB8500 DMA event line macros 2010-10-04 19:46:07 +01:00
usb.c mach-ux500: fix USB build error 2011-06-27 19:45:40 +02:00