2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-30 08:04:13 +08:00
linux-next/arch/arm
Tony Lindgren ad19d8d90c [ARM] 5436/1: ARM: OMAP: Fix compile for rx51
This fixes a compile error caused by a mismerge while rebasing the patch:

linux-2.6/arch/arm/mach-omap2/board-rx51-peripherals.c:354:
undefined reference to `twl4030_mmc_init'

Looks like I need to also update my build scripts, just grepping for error:
in the logs is not obviously enough..

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-04-01 22:14:51 +01:00
..
boot Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel 2009-03-26 23:10:11 +00:00
common clkdev: add possibility to get a clock based on the device name 2009-03-27 14:51:13 +01:00
configs Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel 2009-03-25 18:31:35 +00:00
include/asm Merge branch 'master' into devel 2009-03-28 20:30:18 +00:00
kernel Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-03-28 14:03:14 -07:00
lib Merge branch 'clps7500' into devel 2008-11-27 12:39:43 +00:00
mach-aaec2000 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-at91 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-clps711x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-davinci [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ebsa110 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ep93xx Merge branch 'master' of git://git.marvell.com/orion into devel 2009-03-19 23:10:40 +00:00
mach-footbridge [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-gemini [ARM] arch_reset() now takes a second parameter 2009-03-30 10:40:12 +01:00
mach-h720x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-imx i.MX1: remove fb support from mach-imx 2009-03-27 14:51:13 +01:00
mach-integrator [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-iop13xx Merge branch 'master' into devel 2009-03-28 20:30:18 +00:00
mach-iop32x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-iop33x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ixp4xx [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ixp23xx [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ixp2000 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-kirkwood Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-ks8695 Merge branch 'highmem' into devel 2009-03-24 22:47:45 +00:00
mach-l7200 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-lh7a40x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-loki [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-mmp [ARM] arch_reset() now takes a second parameter 2009-03-30 10:40:12 +01:00
mach-msm [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-mv78xx0 Merge branch 'master' of git://git.marvell.com/orion into devel 2009-03-19 23:10:40 +00:00
mach-mx1 Merge branch 'master' of git://git.marvell.com/orion into devel 2009-03-19 23:10:40 +00:00
mach-mx2 i.MX21/27: remove ifdef CONFIG_FB_IMX 2009-03-27 14:51:14 +01:00
mach-mx3 qong: basic support for Dave/DENX QongEVB-LITE board 2009-03-13 10:35:05 +01:00
mach-netx [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ns9xxx Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-omap1 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel 2009-03-25 18:31:35 +00:00
mach-omap2 [ARM] 5436/1: ARM: OMAP: Fix compile for rx51 2009-04-01 22:14:51 +01:00
mach-orion5x Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-pnx4008 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-pxa Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-realview [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-rpc [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-s3c24a0/include/mach [ARM] S3C: Make IRQ_EINT sleep control common 2009-03-08 12:35:36 +00:00
mach-s3c2400 [ARM] remove a common set of __virt_to_bus definitions 2008-11-28 15:36:49 +00:00
mach-s3c2410 Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-s3c2412 Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-s3c2440 Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-s3c2442 [ARM] Arrange for platforms to select appropriate CPU support 2008-11-27 12:38:00 +00:00
mach-s3c2443 S3C24XX: Move and update IIS headers 2009-03-05 12:00:59 +00:00
mach-s3c6400 Merge branch 'next-s3c64xx-regs' of git://aeryn.fluff.org.uk/bjdooks/linux into devel 2009-03-26 22:46:22 +00:00
mach-s3c6410 [ARM] SMDK6410: Declare iodesc table static 2009-02-26 23:21:49 +00:00
mach-sa1100 [ARM] collie: fix two minor formatting nits 2009-03-25 10:15:00 +00:00
mach-shark [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-versatile [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-w90x900 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mm [ARM] Kirkwood: small L2 code cleanup 2009-03-28 22:39:30 -04:00
nwfpe [ARM] Convert asm/uaccess.h to linux/uaccess.h 2008-09-06 11:35:55 +01:00
oprofile Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-03-28 14:03:14 -07:00
plat-iop [ARM] iop: iop3xx needs registers mapped uncached+unbuffered 2008-11-09 11:18:36 +00:00
plat-mxc mxc: add arch_reset() function 2009-03-27 14:51:14 +01:00
plat-omap [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx 2009-03-28 19:35:02 +00:00
plat-orion Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
plat-pxa [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined 2009-03-26 21:30:11 +08:00
plat-s3c Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
plat-s3c24xx Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
plat-s3c64xx [ARM] S3C64XX: add AHB_CON and SPCON register address definitions 2009-03-10 16:33:42 +00:00
tools [ARM] update mach-types 2009-03-23 16:12:37 -04:00
vfp [ARM] 5388/1: Add hwcap bits for VFPv3 and VFPv3D16 2009-02-12 10:59:44 +00:00
Kconfig Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel 2009-03-26 23:10:11 +00:00
Kconfig-nommu
Kconfig.debug [ARM] 5412/1: XSCALE: add ice dcc support 2009-02-27 20:57:46 +00:00
Makefile Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel 2009-03-26 23:10:11 +00:00