Kumar Gala 9c4cb82515 powerpc: Remove use of CONFIG_PPC_MERGE ... Now that arch/ppc is gone and CONFIG_PPC_MERGE is always set, remove the dead code associated with !CONFIG_PPC_MERGE from arch/powerpc and include/asm-powerpc. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>		2008-08-04 13:18:17 +10:00
..
Kconfig	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2008-07-25 11:08:17 -07:00
Makefile	powerpc: Remove use of CONFIG_PPC_MERGE	2008-08-04 13:18:17 +10:00
efika.c	[POWERPC] Add common clock setting routine mpc52xx_psc_set_clkdiv()	2008-01-26 15:32:18 -07:00
lite5200.c	[POWERPC] Replace remaining __FUNCTION__ occurrences	2008-04-01 20:43:09 +11:00
lite5200_pm.c	powerpc/mpc5200: Fix lite5200b suspend/resume	2008-07-01 16:08:24 -06:00
lite5200_sleep.S	[POWERPC] MPC5200 low power mode	2007-09-19 15:25:34 +10:00
mpc52xx_common.c	[POWERPC] Add export for mpc52xx_set_psc_clkdiv	2008-02-23 22:51:28 -07:00
mpc52xx_gpio.c	mpc52xx_gpio iomem annotations	2008-06-04 08:06:02 -07:00
mpc52xx_pci.c	powerpc/mpc5200: PCI write combine timer	2008-07-12 12:10:12 -06:00
mpc52xx_pic.c	[POWERPC] mpc5200: add interrupt type function	2008-04-29 07:16:35 -06:00
mpc52xx_pic.h	[POWERPC] Separate IRQ config / register set from main header	2006-12-04 20:41:41 +11:00
mpc52xx_pm.c	[POWERPC] mpc5200: normalize compatible property bindings	2008-01-26 15:26:01 -07:00
mpc52xx_sleep.S	[POWERPC] mpc52xx suspend to deep-sleep	2007-05-07 20:31:15 +10:00
mpc5200_simple.c	[POWERPC] mpc5200: add Phytec pcm030 board support	2008-04-29 07:17:12 -06:00