The patch titled sb1250-macc-de-typedef-de-volatile-de-etc update has been added to the -mm tree. Its filename is sb1250-macc-de-typedef-de-volatile-de-etc-update.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: sb1250-macc-de-typedef-de-volatile-de-etc update From: "Maciej W. Rozycki" <macro@xxxxxxxxxxxxxx> Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/sb1250-mac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/net/sb1250-mac.c~sb1250-macc-de-typedef-de-volatile-de-etc-update drivers/net/sb1250-mac.c --- a/drivers/net/sb1250-mac.c~sb1250-macc-de-typedef-de-volatile-de-etc-update +++ a/drivers/net/sb1250-mac.c @@ -242,7 +242,6 @@ struct sbmac_softc { /* * Linux-specific things */ - struct net_device *sbm_dev; /* pointer to linux device */ spinlock_t sbm_lock; /* spin lock */ struct timer_list sbm_timer; /* for monitoring MII */ @@ -782,7 +781,7 @@ static void sbdma_initctx(struct sbmacdm */ d->sbdma_ctxtable = kcalloc(d->sbdma_maxdescr, - sizeof(*d->sbdma_ctxtable), GFP_KERNEL); + sizeof(*d->sbdma_ctxtable), GFP_KERNEL); #ifdef CONFIG_SBMAC_COALESCE /* _ Patches currently in -mm which might be from macro@xxxxxxxxxxxxxx are git-mips.patch sb1250-macc-de-typedef-de-volatile-de-etc.patch sb1250-macc-de-typedef-de-volatile-de-etc-update.patch include-linux-typesh-in-if_fddih.patch avoid-negative-and-full-width-shifts-in-radix-treec.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html