linux-kernel - linux-next: manual merge of the mfd tree with the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20111101161950.798537fc333958b0b7d72668@canb.auug.org.au>
Date:	Tue, 1 Nov 2011 16:19:50 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Samuel Ortiz <sameo@...ux.intel.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kyle Manna <kyle@...emanna.com>,
	Tony Lindgren <tony@...mide.com>, Arnd Bergmann <arnd@...db.de>
Subject: linux-next: manual merge of the mfd tree with the arm-soc tree

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-omap2/board-omap3beagle.c between commit be7324605873
("ARM: OMAP2+: Remove custom init_irq for remaining boards") from the
arm-soc tree and commit 935bac2b14b0 ("arm: BeagleBoard: add support for
the twl4030-madc") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index 70261bc,0d68c8d..0000000
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -444,6 -445,23 +445,11 @@@ static struct platform_device keys_gpi
  	},
  };
  
 -static void __init omap3_beagle_init_early(void)
 -{
 -	omap2_init_common_infrastructure();
 -	omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
 -				  mt46h32m32lf6_sdrc_params);
 -}
 -
 -static void __init omap3_beagle_init_irq(void)
 -{
 -	omap3_init_irq();
 -}
 -
+ static struct platform_device madc_hwmon = {
+ 	.name	= "twl4030_madc_hwmon",
+ 	.id	= -1,
+ };
+ 
  static struct platform_device *omap3_beagle_devices[] __initdata = {
  	&leds_gpio,
  	&keys_gpio,

Content of type "application/pgp-signature" skipped