Kumar Gala 68e1ee62f0 powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks ... Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all powerpc platforms and we want to get rid of CONFIG_PPC_MERGE use CONFIG_PPC instead. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>		2008-09-23 10:41:28 -05:00
..
algos	i2c: Let users select algorithm drivers manually again	2008-08-10 22:56:15 +02:00
busses	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
chips	USB: isp1301: fix compilation	2008-08-13 17:32:56 -07:00
i2c-boardinfo.c	i2c: Add i2c_board_info and i2c_new_device()	2007-05-01 23:26:31 +02:00
i2c-core.c	i2c: Prevent log spam on some DVB adapters	2008-08-28 08:33:23 +02:00
i2c-core.h	i2c: Add i2c_board_info and i2c_new_device()	2007-05-01 23:26:31 +02:00
i2c-dev.c	i2c: correct some size_t printk formats	2008-08-10 22:56:16 +02:00
Kconfig	i2c: Let users select algorithm drivers manually again	2008-08-10 22:56:15 +02:00
Makefile	i2c: Add i2c_board_info and i2c_new_device()	2007-05-01 23:26:31 +02:00