Messages in this thread |  | | Date | Tue, 13 Nov 2001 01:42:48 +0100 | From | "J . A . Magallon" <> | Subject | Re: Linux 2.4.15-pre4 - merge with Alan |
| |
On 20011113 Christoph Hellwig wrote: >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
This should also stay, so ?
- if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then - dep_tristate 'ITE I2C Algorithm' CONFIG_ITE_I2C_ALGO $CONFIG_I2C - if [ "$CONFIG_ITE_I2C_ALGO" != "n" ]; then - dep_tristate ' ITE I2C Adapter' CONFIG_ITE_I2C_ADAP $CONFIG_ITE_I2C_ALGO - fi - fi
-- J.A. Magallon # Let the source be with you... mailto:jamagallon@able.es Mandrake Linux release 8.2 (Cooker) for i586 Linux werewolf 2.4.15-pre4-beo #2 SMP Tue Nov 13 00:50:12 CET 2001 i686 - 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/
|  |