Re: Linux 2.4.15-pre4 - merge with Alan

From: Christoph Hellwig (hch@ns.caldera.de)
Date: Mon Nov 12 2001 - 19:14:40 EST


In article <20011113004846.G1531@werewolf.able.es> you wrote:
>
> This is an update-cleanup of the i2c code to the current CVS. In short,
> it adds version info printing and some CONFIG_ cleanups (there were
> CONFIG_ vars defined in Config.in that had been renamed inside the code).
> Please consider for next pre of 2.4.15.

Could you please think before doing a merge next time?
The patch backs out local changes like ite support:

> -obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o
> -obj-$(CONFIG_ITE_I2C_ALGO) += i2c-algo-ite.o
> -obj-$(CONFIG_ITE_I2C_ADAP) += i2c-adap-ite.o
> +obj-$(CONFIG_I2C_PCFISA) += i2c-elektor.o
> obj-$(CONFIG_I2C_PROC) += i2c-proc.o

        Christoph

-- 
Of course it doesn't work. We've performed a software upgrade.
-
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/



This archive was generated by hypermail 2b29 : Thu Nov 15 2001 - 21:00:31 EST