This patch is still being white space munged so it doesn't apply. The context is being shifted over 1 column. All your other patches add new files so there is no context and hence they apply.
Mikey In message <[EMAIL PROTECTED]> you wrote: > Signed-off-by: Jan-Bernd Themann <[EMAIL PROTECTED]> > > > drivers/net/Kconfig | 6 ++++++ > drivers/net/Makefile | 1 + > 2 files changed, 7 insertions(+) > > > > diff -Nurp -X dontdiff linux-2.6.18-rc4/drivers/net/Kconfig patched_kernel/dr ivers/net/Kconfig > --- linux-2.6.18-rc4/drivers/net/Kconfig 2006-08-06 11:20:11.000000000 - 0700 > +++ patched_kernel/drivers/net/Kconfig 2006-08-08 03:00:49.526421944 - 0700 > @@ -2277,6 +2277,12 @@ config CHELSIO_T1 > To compile this driver as a module, choose M here: the module > will be called cxgb. > > +config EHEA > + tristate "eHEA Ethernet support" > + depends on IBMEBUS > + ---help--- > + This driver supports the IBM pSeries ethernet adapter > + > config IXGB > tristate "Intel(R) PRO/10GbE support" > depends on PCI > diff -Nurp -X dontdiff linux-2.6.18-rc4/drivers/net/Makefile patched_kernel/d rivers/net/Makefile > --- linux-2.6.18-rc4/drivers/net/Makefile 2006-08-06 11:20:11.000000000 - 0700 > +++ patched_kernel/drivers/net/Makefile 2006-08-08 03:00:30.061451584 - 0700 > @@ -10,6 +10,7 @@ obj-$(CONFIG_E1000) += e1000/ > obj-$(CONFIG_IBM_EMAC) += ibm_emac/ > obj-$(CONFIG_IXGB) += ixgb/ > obj-$(CONFIG_CHELSIO_T1) += chelsio/ > +obj-$(CONFIG_EHEA) += ehea/ > obj-$(CONFIG_BONDING) += bonding/ > obj-$(CONFIG_GIANFAR) += gianfar_driver.o > > > > _______________________________________________ > Linuxppc-dev mailing list > [EMAIL PROTECTED] > https://ozlabs.org/mailman/listinfo/linuxppc-dev > - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
