From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Samuel Ortiz <sameo@openedhand•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Michael Hennerich <michael.hennerich@analog•com>,
Dmitry Torokhov <dmitry.torokhov@gmail•com>,
Mark Brown <broonie@opensource•wolfsonmicro.com>
Subject: linux-next: manual merge of the mfd tree with the input tree
Date: Wed, 5 Aug 2009 13:31:06 +1000 [thread overview]
Message-ID: <20090805133106.03c8e64e.sfr@canb.auug.org.au> (raw)
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
drivers/input/misc/Kconfig between commit
4832958218f96f98009c5e01729fbe2b48c7124c ("Input: add Blackfin rotary
input driver") from the input tree and commit
f45c2fa48317249892af5b63f4b35c7c90191df3 ("input: Add support for the
WM831x ON pin") from the mfd tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/input/misc/Kconfig
index cbe21bc,c8e7d8a..0000000
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@@ -270,13 -270,14 +270,23 @@@ config INPUT_DM355EV
To compile this driver as a module, choose M here: the
module will be called dm355evm_keys.
+config INPUT_BFIN_ROTARY
+ tristate "Blackfin Rotary support"
+ depends on BF54x || BF52x
+ help
+ Say Y here if you want to use the Blackfin Rotary.
+
+ To compile this driver as a module, choose M here: the
+ module will be called bfin-rotary.
+
+ config INPUT_WM831X_ON
+ tristate "WM831X ON pin"
+ depends on MFD_WM831X
+ help
+ Support the ON pin of WM831X PMICs as an input device
+ reporting power button status.
+
+ To compile this driver as a module, choose M here: the module
+ will be called wm831x_on.
+
endif
next reply other threads:[~2009-08-05 3:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-05 3:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-02-14 2:10 linux-next: manual merge of the mfd tree with the input tree Stephen Rothwell
2017-02-14 8:38 ` Lee Jones
2017-02-15 19:38 ` Dmitry Torokhov
2025-07-03 4:01 Stephen Rothwell
2025-07-29 23:17 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090805133106.03c8e64e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michael.hennerich@analog$(echo .)com \
--cc=sameo@openedhand$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox