Subject: Re: [PATCH net-next 01/15] drivers/net: delete 486 Apricot support

From: Paul Gortmaker <[email-masked]>
Date: Tue, 22 Jan 2013 10:51:25 -0500

[[PATCH net-next 01/15] drivers/net: delete 486 Apricot support] On 21/01/2013 (Mon 20:46) Paul Gortmaker wrote:

[...]

>  
> -#elif defined(ENABLE_APRICOT)
> -
> -	{
> -		u32 scp = virt_to_bus(&lp->scp);
> -
> -		/* change the scp address */
> -		outw(0, ioaddr);
> -		outw(0, ioaddr);
> -		outb(4, ioaddr + 0xf);
> -		outw(scp | 2, ioaddr);
> -		outw(scp >> 16, ioaddr);
> -	}
> -#endif
> -

I deleted one too many lines here.  That last #endif needs
to stay as the parent #if still remains.  Fengguang's 0-day
testing found it in an m68k allyesconfig build.

I've folded this in, build tested for m68k locally, and done
a forced update on my legacy-isa-delete branch.

Paul.
--