lkml.org 
[lkml]   [2012]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT PATCH] big staging merge for 3.3
On Mon, Jan 9, 2012 at 11:08 AM, Greg KH <greg@kroah.com> 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.

Linus


\
 
 \ /
  Last update: 2012-01-09 21:19    [W:0.037 / U:1.184 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site