lkml.org 
[lkml]   [2011]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the staging tree with the driver-core tree
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/iio/adc/ad799x_core.c between commit 6e5af184f810
("staging:iio: Use module_i2c_driver to register I2C drivers") from the
tree and commit 55e4390cb04e ("staging:iio: Add missing
MODULE_DEVICE_TABLE and MODULE_ALIAS") from the staging tree.

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

diff --cc drivers/staging/iio/adc/ad799x_core.c
index c0d2f88,5bedb19..0000000
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@@ -934,4 -944,6 +935,3 @@@ module_i2c_driver(ad799x_driver)
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
MODULE_DESCRIPTION("Analog Devices AD799x ADC");
MODULE_LICENSE("GPL v2");
- MODULE_ALIAS("i2c:ad799x");
-
-module_init(ad799x_init);
-module_exit(ad799x_exit);
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-11-28 05:25    [W:0.288 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site