Messages in this thread | | | Date | Fri, 24 Mar 2006 20:53:27 -0500 | Subject | Re: -mm merge plans | From | (Arthur Othieno) |
| |
On Wed, Mar 22, 2006 at 08:53:05PM -0800, Andrew Morton wrote: > > A look at the -mm lineup for 2.6.17:
[snip]
> net-remove-config_net_cbus-conditional-for-ns8390.patch
On Sun, Feb 19, 2006 at 08:26:25AM -0800, Paul Gortmaker wrote: > Fine by me. > > Paul. > > Signed-off-by: Paul Gortmaker <p_gortmaker@yahoo.com> > > --- Arthur Othieno <apgo@patchbomb.org> wrote: > > > Don't bother testing for CONFIG_NET_CBUS ("NEC PC-9800 C-bus cards"); > > it went out with the rest of PC98 subarch. > > > > Signed-off-by: Arthur Othieno <apgo@patchbomb.org> > > > > --- > > > > drivers/net/8390.h | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > 6eca48257ddfe560447fda2c0c1961d78b06a047 > > diff --git a/drivers/net/8390.h b/drivers/net/8390.h > > index 599b68d..51e39dc 100644 > > --- a/drivers/net/8390.h > > +++ b/drivers/net/8390.h > > @@ -134,7 +134,7 @@ struct ei_device { > > #define inb_p(_p) inb(_p) > > #define outb_p(_v,_p) outb(_v,_p) > > > > -#elif defined(CONFIG_NET_CBUS) || defined(CONFIG_NE_H8300) || > > defined(CONFIG_NE_H8300_MODULE) > > +#elif defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE) > > #define EI_SHIFT(x) (ei_local->reg_offset[x]) > > #else > > #define EI_SHIFT(x) (x) > > -- > > 1.1.5 - 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/
| |