lkml.org 
[lkml]   [2009]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the voltage tree with the mfd tree
Hi Liam,

Today's linux-next merge of the voltage tree got a conflict in
drivers/mfd/Kconfig between commit
b60463644b8baea3c649faeb9d7c44c104f14588 ("mfd: Fix 88PM8607 I2C
dependency") from the mfd tree and commit
258e3427f83a573d738344c2f5499da5e026e1df ("regulator: add 88PM8607 PMIC
driver") from the voltage tree.

I fixed it up using the mfd tree version. ("depends on I2C=y" v "depends
on I2C").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2009-11-25 07:59    [W:0.299 / U:1.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site