Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and...

	depends on !XIP_KERNEL && MMU

	depends on !ARCH_REALVIEW || !SPARSEMEM

	help

	  Patch phys-to-virt translation functions at runtime according to

	  the position of the kernel in system memory.

	  Patch phys-to-virt and virt-to-phys translation functions at

	  boot and module load time according to the position of the

	  kernel in system memory.

	  This can only be used with non-XIP with MMU kernels where

	  the base of physical memory is at a 16MB boundary.

	  This can only be used with non-XIP MMU kernels where the base

	  of physical memory is at a 16MB boundary, or theoretically 64K

	  for the MSM machine class.

config ARM_PATCH_PHYS_VIRT_16BIT

	def_bool y

	depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM

	help

	  This option extends the physical to virtual translation patching

	  to allow physical memory down to a theoretical minimum of 64K

	  boundaries.

source "init/Kconfig"

	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based

	  System-on-Chip devices.

config ARCH_NS9XXX

	bool "NetSilicon NS9xxx"

	select CPU_ARM926T

	select GENERIC_GPIO

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	help

	  Say Y here if you intend to run this kernel on a NetSilicon NS9xxx

	  System.

	  <http://www.digi.com/products/microprocessors/index.jsp>

config ARCH_W90X900

	bool "Nuvoton W90X900 CPU"

	select CPU_ARM926T

source "arch/arm/mach-nomadik/Kconfig"

source "arch/arm/plat-nomadik/Kconfig"

source "arch/arm/mach-ns9xxx/Kconfig"

source "arch/arm/mach-nuc93x/Kconfig"

source "arch/arm/plat-omap/Kconfig"

source "kernel/time/Kconfig"

config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	bool "Symmetric Multi-Processing"

	depends on CPU_V6K || CPU_V7

	depends on GENERIC_CLOCKEVENTS

	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

	def_bool ARCH_SPARSEMEM_ENABLE

config HIGHMEM

	bool "High Memory Support (EXPERIMENTAL)"

	depends on MMU && EXPERIMENTAL

	bool "High Memory Support"

	depends on MMU

	help

	  The address space of ARM processors is only 4 Gigabytes large

	  and it has to accommodate user address space, kernel address

	  time by entering them here. As a minimum, you should specify the

	  memory size and the root device (e.g., mem=64M root=/dev/nfs).

choice

	prompt "Kernel command line type" if CMDLINE != ""

	default CMDLINE_FROM_BOOTLOADER

config CMDLINE_FROM_BOOTLOADER

	bool "Use bootloader kernel arguments if available"

	help

	  Uses the command-line options passed by the boot loader. If

	  the boot loader doesn't provide any, the default kernel command

	  string provided in CMDLINE will be used.

config CMDLINE_EXTEND

	bool "Extend bootloader kernel arguments"

	help

	  The command-line arguments provided by the boot loader will be

	  appended to the default kernel command string.

config CMDLINE_FORCE

	bool "Always use the default kernel command string"

	depends on CMDLINE != ""

	help

	  Always use the default kernel command string, even if the boot

	  loader passes other arguments to the kernel.

	  This is useful if you cannot or don't want to change the

	  command-line options your boot loader passes to the kernel.

	  If unsure, say N.

endchoice

config XIP_KERNEL

	bool "Kernel Execute-In-Place from ROM"

source "kernel/power/Kconfig"

config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5P64X0 && !ARCH_S5P6442

	depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE

	def_bool y

machine-$(CONFIG_ARCH_MXS)		:= mxs

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_NS9XXX)		:= ns9xxx

machine-$(CONFIG_ARCH_OMAP1)		:= omap1

machine-$(CONFIG_ARCH_OMAP2)		:= omap2

machine-$(CONFIG_ARCH_OMAP3)		:= omap2

		orr	r1, r1, #3 << 10

		add	r2, r3, #16384

1:		cmp	r1, r9			@ if virt > start of RAM

#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH

		orrhs	r1, r1, #0x08		@ set cacheable

#else

		orrhs	r1, r1, #0x0c		@ set cacheable, bufferable

#endif

		cmp	r1, r10			@ if virt > end of RAM

		bichs	r1, r1, #0x0c		@ clear cacheable, bufferable

		str	r1, [r0], #4		@ 1:1 mapping

		mov	pc, lr

ENDPROC(__setup_mmu)

__arm926ejs_mmu_cache_on:

#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH

		mov	r0, #4			@ put dcache in WT mode

		mcr	p15, 7, r0, c15, c0, 0

#endif

__armv4_mmu_cache_on:

		mov	r12, lr

#ifdef CONFIG_MMU

		W(b)	__armv4_mpu_cache_off

		W(b)	__armv4_mpu_cache_flush

		.word	0x41069260		@ ARM926EJ-S (v5TEJ)

		.word	0xff0ffff0

		b	__arm926ejs_mmu_cache_on

		b	__armv4_mmu_cache_off

		b	__armv5tej_mmu_cache_flush

		.word	0x00007000		@ ARM7 IDs

		.word	0x0000f000

		mov	pc, lr

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_NS9XXX=y

CONFIG_MACH_CC9P9360DEV=y

CONFIG_MACH_CC9P9360JS=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_FPE_NWFPE=y

CONFIG_NET=y

CONFIG_PACKET=m

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_SYN_COOKIES=y

CONFIG_MTD=m

CONFIG_MTD_CONCAT=m

CONFIG_MTD_CHAR=m

CONFIG_MTD_BLOCK=m

CONFIG_MTD_CFI=m

CONFIG_MTD_JEDECPROBE=m

CONFIG_MTD_CFI_AMDSTD=m

CONFIG_MTD_PHYSMAP=m

CONFIG_BLK_DEV_LOOP=m

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=m

CONFIG_I2C_GPIO=m

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=m

CONFIG_LEDS_GPIO=m

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=m

CONFIG_LEDS_TRIGGER_HEARTBEAT=m

CONFIG_RTC_CLASS=m

CONFIG_EXT2_FS=m

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=m

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_EXTRA_PASS=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PLAT_SPEAR=y

CONFIG_MACH_SPEAR310=y

CONFIG_BINFMT_MISC=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_INPUT_FF_MEMLESS=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_RAW_DRIVER=y

CONFIG_MAX_RAW_DEVS=8192

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_PL061=y

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_AUTOFS4_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_FAT_DEFAULT_IOCHARSET="ascii"

CONFIG_TMPFS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="utf8"

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

# CONFIG_CRC32 is not set