kevin/linux
1
Fork 0
Code
9e9074160f
linux/arch/arm/mach-pxa
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
am200epd.c
am300epd.c
balloon3.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
capc7117.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
clock-pxa2xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
clock-pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
clock.c ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
clock.h ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
cm-x2xx-pci.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
cm-x2xx-pci.h
cm-x2xx.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
cm-x255.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
cm-x270.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
cm-x300.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
colibri-evalboard.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa3xx.c
colibri-pxa270-income.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa270.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
colibri-pxa300.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
colibri-pxa320.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
corgi_pm.c
corgi.c ARM: platform fixups: remove mdesc argument to fixup function 2011-10-17 09:13:41 +01:00
cpufreq-pxa2xx.c
cpufreq-pxa3xx.c
csb701.c
csb726.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
devices.c
devices.h
em-x270.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
eseries.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
eseries.h ARM: platform fixups: remove mdesc argument to fixup function 2011-10-17 09:13:41 +01:00
ezx.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
generic.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
generic.h ARM: pxa: move declarations from generic.h to <soc>.h 2011-07-12 19:50:32 +08:00
gumstix.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
h5000.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
himalaya.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
hx4700.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
icontrol.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
idp.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
irq.c Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-27 08:39:10 +02:00
Kconfig mtd: pxa: convert to mtd_device_register() 2011-05-25 02:20:48 +01:00
leds-idp.c
leds-lubbock.c
leds-mainstone.c
leds.c
leds.h
littleton.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
lpd270.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
lubbock.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
magician.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
mainstone.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
Makefile
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mfp-pxa2xx.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
mfp-pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
mioa701_bootresume.S
mioa701.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
mp900.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
mxm8x10.c
palm27x.c
palmld.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmt5.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmtc.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmte2.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmtreo.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmtx.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
palmz72.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
pcm027.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
pcm990-baseboard.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
pm.c ARM: pm: move cpu_init() call into core code 2011-06-24 08:48:43 +01:00
poodle.c ARM: platform fixups: remove mdesc argument to fixup function 2011-10-17 09:13:41 +01:00
pxa2xx.c
pxa3xx-ulpi.c
pxa3xx.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
pxa25x.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
pxa27x.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
pxa95x.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
pxa300.c
pxa320.c
pxa930.c
raumfeld.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
reset.c
saar.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
saarb.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
sharpsl_pm.c
sleep.S ARM: pm: pxa: move cpu_suspend into C code 2011-06-24 08:48:45 +01:00
smemc.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
spitz_pm.c gpio: include linux/gpio.h where needed 2011-06-16 08:40:44 -06:00
spitz.c ARM: platform fixups: remove mdesc argument to fixup function 2011-10-17 09:13:41 +01:00
standby.S
stargate2.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
tavorevb3.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
tavorevb.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
time.c clocksource: convert ARM 32-bit up counting clocksources 2011-05-23 18:04:51 +01:00
tosa-bt.c
tosa.c ARM: platform fixups: remove mdesc argument to fixup function 2011-10-17 09:13:41 +01:00
trizeps4.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
viper.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
vpac270.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
xcep.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
z2.c ARM: mach-pxa: remove mach/memory.h 2011-10-13 12:49:47 -04:00
zeus.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00
zylonite_pxa300.c
zylonite_pxa320.c
zylonite.c ARM: mach-pxa: convert boot_params to atag_offset 2011-08-21 17:15:07 -04:00