Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge

	bool

	depends on PPC_PMAC && POWER4

	select U3_DART

	select GENERIC_TBSYNC

	default y

config PPC_PREP

	bool "  Maple 970FX Evaluation Board"

	select U3_DART

	select MPIC_BROKEN_U3

	select GENERIC_TBSYNC

	default n

	help

          This option enables support for the Maple 970FX Evaluation Board.

	  For more informations, refer to <http://www.970eval.com>

config PPC_BPA

	bool "  Broadband Processor Architecture"

config PPC_CELL

	bool "  Cell Broadband Processor Architecture"

	depends on PPC_MULTIPLATFORM && PPC64

	select PPC_RTAS

	select MMIO_NVRAM

config PPC_OF

	bool

	depends on PPC_RTAS

	default n

config RTAS_PROC

	bool "Proc interface to RTAS"

	depends on PPC_RTAS

	default y

config RTAS_FLASH

	tristate "Firmware flash interface"

	depends on PPC64 && RTAS_PROC

config MMIO_NVRAM

	bool

	default n

config MPIC_BROKEN_U3

	bool

	depends on PPC_MAPLE

	default y

config BPA_IIC

	depends on PPC_BPA

config CELL_IIC

	depends on PPC_CELL

	bool

	default y

	bool

	default n

config GENERIC_TBSYNC

	bool

	default y if CONFIG_PPC32 && CONFIG_SMP

	default n

source "drivers/cpufreq/Kconfig"

config CPU_FREQ_PMAC

# Rewritten by Cort Dougan and Paul Mackerras

#

# This must match PAGE_OFFSET in include/asm-powerpc/page.h.

KERNELLOAD	:= $(CONFIG_KERNEL_START)

HAS_BIARCH	:= $(call cc-option-yn, -m32)

ifeq ($(CONFIG_PPC64),y)

override CC	+= -m$(SZ)

endif

LDFLAGS_vmlinux	:= -Ttext $(KERNELLOAD) -Bstatic -e $(KERNELLOAD)

LDFLAGS_vmlinux	:= -Bstatic

# The -Iarch/$(ARCH)/include is temporary while we are merging

CPPFLAGS	+= -Iarch/$(ARCH) -Iarch/$(ARCH)/include