linux-next: manual merge of the staging tree with the staging.current tree
From: Stephen Rothwell <hidden>
Date: 2010-12-02 02:23:06
Also in:
lkml
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 ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 490 bytes