Messages in this thread | | | Date | Wed, 01 Dec 2010 19:20:46 -0800 | From | Randy Dunlap <> | Subject | Re: linux-next: manual merge of the staging tree with the staging.current tree |
| |
On 12/01/10 18:22, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/winbond/sysdef.h between commit > 412dc7f368bf10a8049a8a4c41abbfd0108742e7 ("staging: fix winbond build, > needs delay.h") from the staging.current tree and commit > ddee7e28e7d5e4ba2b8537c6a59b035745c250bb ("Staging: w35und: Remove empty > sysdef.h header") from the staging tree. > > I removed the file. I wonder if > drivers/staging/winbond/phy_calibration.c and > drivers/staging/winbond/reg.c now need their own includes of > linux/delay.h ...
Probably, since sysdef.h was no longer an empty file.
-- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***
| |