On Mon, Jan 09, 2012 at 12:17:15PM -0800, Linus Torvalds wrote: > On Mon, Jan 9, 2012 at 11:08 AM, Greg KH <[email protected]> wrote: > > > > Note, you will get a merge conflict in the > > drivers/staging/iio/adc/ad799x_core.c file, but it's pretty simple to > > resolve (just delete the module_init/exit calls, and keep the > > MODULE_ALIAS line). > > Are you sure about keeping the MODULE_ALIAS line? > > It was removed by commit 55e4390cb04e ("staging:iio: Add missing > MODULE_DEVICE_TABLE and MODULE_ALIAS") which added the > MODULE_DEVICE_TABLE() line for that driver instead. > > The natural merge would seem to be to remove that line too.
Ugh, yes, you are right, that should be the correct thing to do. greg k-h _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
