Rob Herring 2c4fabec87 ARM: pxa: add memory resource to SA1100 RTC device ... The drivers for the SA1100 and PXA RTCs are now mutually exclusive, so add the memory resource for the sa1100-rtc device. Since the memory resource is already present in the pxa_rtc_resources, that makes sa1100_rtc_resources and pxa_rtc_resources equivalent, so use pxa_rtc_resources for both devices and remove the duplicate sa1100_rtc_resources. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Daniel Mack <daniel@zonque.org> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>		2015-09-05 19:37:16 +02:00
..
boot	This is the bulk of pin control changes for the v4.3 development	2015-09-04 10:22:09 -07:00
common	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
configs	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2015-09-04 15:49:32 -07:00
crypto
firmware
include	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
kernel	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
kvm
lib	Merge branches 'cleanup', 'fixes', 'misc', 'omap-barrier' and 'uaccess' into for-linus	2015-09-03 15:28:37 +01:00
mach-alpine
mach-asm9260
mach-at91	ARM: SoC platform updates for v4.3	2015-09-01 12:18:40 -07:00
mach-axxia
mach-bcm	ARM: SoC platform updates for v4.3	2015-09-01 12:18:40 -07:00
mach-berlin
mach-clps711x
mach-cns3xxx
mach-davinci	ARM: SoC platform updates for v4.3	2015-09-01 12:18:40 -07:00
mach-digicolor
mach-dove
mach-ebsa110
mach-efm32
mach-ep93xx
mach-exynos	ARM: SoC cleanups for v4.3	2015-09-01 12:10:20 -07:00
mach-footbridge
mach-gemini
mach-highbank
mach-hisi
mach-imx	ARM: SoC platform updates for v4.3	2015-09-01 12:18:40 -07:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-keystone
mach-ks8695
mach-lpc18xx
mach-lpc32xx
mach-mediatek
mach-meson
mach-mmp	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
mach-moxart
mach-mv78xx0
mach-mvebu	ARM: SoC driver updates for v4.3	2015-09-01 13:00:04 -07:00
mach-mxs
mach-netx
mach-nomadik
mach-nspire
mach-omap1
mach-omap2	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
mach-orion5x	ARM: DT updates for v4.3	2015-09-01 13:09:20 -07:00
mach-picoxcell
mach-prima2	Merge branches 'cleanup', 'fixes', 'misc', 'omap-barrier' and 'uaccess' into for-linus	2015-09-03 15:28:37 +01:00
mach-pxa	ARM: pxa: add memory resource to SA1100 RTC device	2015-09-05 19:37:16 +02:00
mach-qcom
mach-realview
mach-rockchip	ARM: rockchip: pm: Fix PTR_ERR() argument	2015-08-24 12:39:14 +02:00
mach-rpc
mach-s3c24xx
mach-s3c64xx	ARM: SoC cleanups for v4.3	2015-09-01 12:10:20 -07:00
mach-s5pv210
mach-sa1100
mach-shmobile	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
mach-socfpga
mach-spear	ARM: SoC cleanups for v4.3	2015-09-01 12:10:20 -07:00
mach-sti	ARM: SoC platform updates for v4.3	2015-09-01 12:18:40 -07:00
mach-stm32
mach-sunxi
mach-tegra	ARM: SoC driver updates for v4.3	2015-09-01 13:00:04 -07:00
mach-u300
mach-uniphier
mach-ux500	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
mach-versatile
mach-vexpress
mach-vt8500
mach-w90x900
mach-zx	ARM: SoC platform updates for v4.3	2015-09-01 12:18:40 -07:00
mach-zynq	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-09-01 14:33:35 -07:00
mm	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
net
nwfpe
oprofile
plat-iop
plat-omap
plat-orion
plat-pxa
plat-samsung
plat-versatile
probes
tools
vdso
vfp
xen
Kconfig	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
Kconfig-nommu
Kconfig.debug
Makefile