Messages in this thread | | | Date | Wed, 5 Apr 2006 11:02:18 +0200 | From | Adrian Bunk <> | Subject | Re: [-mm patch] drivers/media/video/bt866.c: small fixes |
| |
On Wed, Apr 05, 2006 at 12:42:12AM -0700, Andrew Morton wrote: > Martin Samuelsson <sam@home.se> wrote: > > > > This should fix all things Andrew pointed out when I first submitted the > > avs6eyes driver. > > We still have all that #ifdef MODULE stuff at the end of bt866.c. > (Shouldn't it have module_init() and module_exit() handlers?) >...
This is what my patch does.
Martin's patch does not include my patch, it is on top of it.
You should have seen a merge conflict when merging Martin's patch, and the reason is that you hadn't applied my patch before his patch.
cu Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |