lkml.org 
[lkml]   [2011]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the arm-soc tree with the arm tree
Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-mxs/include/mach/common.h between commit d4e717535e94
("ARM: restart: mxs: use new restart hook") from the arm tree and commit
4e1b4ecaa231 ("ARM: mxs: add saif clkmux functions") from the arm-soc
tree.

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

diff --cc arch/arm/mach-mxs/include/mach/common.h
index 1388485,3bbb94f..0000000
--- a/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@@ -16,7 -16,7 +16,8 @@@ struct clk
extern const u32 *mxs_get_ocotp(void);
extern int mxs_reset_block(void __iomem *);
extern void mxs_timer_init(struct clk *, int);
+extern void mxs_restart(char, const char *);
+ extern int mxs_saif_clkmux_select(unsigned int clkmux);

extern int mx23_register_gpios(void);
extern int mx23_clocks_init(void);
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-12-07 00:55    [W:0.044 / U:0.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site