Blackfin STAMP537 compiling error in 2.6.25-rc8

["Bryan Wu" <cooloney@kernel.org>]

We found the latest kernel compile failed with Blackfin STAMP537
configuration on our daily build machine.
---
  CC      drivers/net/smc91x.o
drivers/net/smc91x.c: In function 'smc_rcv':
drivers/net/smc91x.c:513: warning: passing argument 1 of 'insw' makes
integer from pointer without a cast
drivers/net/smc91x.c: In function 'smc_hardware_send_pkt':
drivers/net/smc91x.c:620: warning: passing argument 1 of 'outsw' makes
integer from pointer without a cast
drivers/net/smc91x.c:1859:32: error: macro "SMC_GET_MAC_ADDR" requires
2 arguments, but only 1 given
drivers/net/smc91x.c: In function 'smc_probe':
drivers/net/smc91x.c:1859: error: 'SMC_GET_MAC_ADDR' undeclared (first
use in this function)
drivers/net/smc91x.c:1859: error: (Each undeclared identifier is
reported only once
drivers/net/smc91x.c:1859: error: for each function it appears in.)
make[2]: *** [drivers/net/smc91x.o] Error 1
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2
---

That is because my -mm tree fixing bug patch:
(http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9e6db60825ef7e7999abc610ce256ba768e58162)
was merged into mainline before the smc91x API change patch in -mm:
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.25-rc5/2.6.25-rc5-mm1/broken-out/smc91x-pass-along-private-data-v2.patch

Did I miss something here? or this patch is on the way before 2.6.25
final release?

Thanks
-Bryan Wu