Hi,
in -next tree, this patch fixes the compilation error instead of
my patch. So, there is a conflict.
commit 9b90dc7bc3079376567fc501e2e84751fa4040fd
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed Aug 27 14:45:37 2008 +1000
rr: build fix for remove CONFIG_KMOD from net
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
thanks,
Hiroshi Shimamoto
--