* linux-next: manual merge of the staging tree with the mfd tree
@ 2012-11-13 3:50 Stephen Rothwell
2012-11-13 18:48 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-11-13 3:50 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Patil, Rachna, Samuel Ortiz,
Jonathan Cameron
[-- Attachment #1: Type: text/plain, Size: 2239 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in
drivers/iio/adc/Kconfig and drivers/iio/adc/Makefile between commit
5e53a69b44e8 ("IIO : ADC: tiadc: Add support of TI's ADC driver") from
the mfd tree and commit 168c9d95a940 ("iio:adc:max1363 move from
staging") from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/iio/adc/Kconfig
index 1401ed1,ef5200a..0000000
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@@ -60,11 -73,22 +73,29 @@@ config LP8788_AD
help
Say yes here to build support for TI LP8788 ADC.
+ config MAX1363
+ tristate "Maxim max1363 ADC driver"
+ depends on I2C
+ select IIO_TRIGGER
+ select MAX1363_RING_BUFFER
+ select IIO_BUFFER
+ select IIO_KFIFO_BUF
+ help
+ Say yes here to build support for many Maxim i2c analog to digital
+ converters (ADC). (max1361, max1362, max1363, max1364, max1036,
+ max1037, max1038, max1039, max1136, max1136, max1137, max1138,
+ max1139, max1236, max1237, max11238, max1239, max11600, max11601,
+ max11602, max11603, max11604, max11605, max11606, max11607,
+ max11608, max11609, max11610, max11611, max11612, max11613,
+ max11614, max11615, max11616, max11617, max11644, max11645,
+ max11646, max11647) Provides direct access via sysfs and buffered
+ data via the iio dev interface.
+
+config TI_AM335X_ADC
+ tristate "TI's ADC driver"
+ depends on MFD_TI_AM335X_TSCADC
+ help
+ Say yes here to build support for Texas Instruments ADC
+ driver which is also a MFD client.
+
endmenu
diff --cc drivers/iio/adc/Makefile
index 4410a90,54ac7bb..0000000
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@@ -6,6 -6,7 +6,8 @@@ obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigm
obj-$(CONFIG_AD7266) += ad7266.o
obj-$(CONFIG_AD7476) += ad7476.o
obj-$(CONFIG_AD7791) += ad7791.o
+ obj-$(CONFIG_AD7887) += ad7887.o
obj-$(CONFIG_AT91_ADC) += at91_adc.o
obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
+ obj-$(CONFIG_MAX1363) += max1363.o
+obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the staging tree with the mfd tree
2012-11-13 3:50 linux-next: manual merge of the staging tree with the mfd tree Stephen Rothwell
@ 2012-11-13 18:48 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2012-11-13 18:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Patil, Rachna, Samuel Ortiz,
Jonathan Cameron
On Tue, Nov 13, 2012 at 02:50:43PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in
> drivers/iio/adc/Kconfig and drivers/iio/adc/Makefile between commit
> 5e53a69b44e8 ("IIO : ADC: tiadc: Add support of TI's ADC driver") from
> the mfd tree and commit 168c9d95a940 ("iio:adc:max1363 move from
> staging") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks fine to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-13 18:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-13 3:50 linux-next: manual merge of the staging tree with the mfd tree Stephen Rothwell
2012-11-13 18:48 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox