Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d3c6ff4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (224 commits)
  ARM: remove 'select GENERIC_TIME'
  ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO
  ARM: 6074/1: oprofile: convert from sysdev to platform device
  ARM: 6073/1: oprofile: remove old files and update KConfig
  ARM: 6072/1: oprofile: use perf-events framework as backend
  ARM: 6071/1: perf-events: allow modules to query the number of hardware counters
  ARM: 6070/1: perf-events: add support for xscale PMUs
  ARM: 6069/1: perf-events: use numeric ID to identify PMU
  ARM: 6064/1: pmu: register IRQs at runtime
  ARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMA
  ARM: 6134/1: Handle instruction cache maintenance fault properly
  ARM: nwfpe: allow debugging output to be configured at runtime
  ARM: rename mach_cpu_disable() to platform_cpu_disable()
  ARM: 6132/1: PL330: Add common core driver
  ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310
  ARM: Move memory mapping into mmu.c
  ARM: Ensure meminfo is sorted prior to sanity_check_meminfo
  ARM: Remove useless linux/bootmem.h includes
  ARM: convert /proc/cpu/aligment to seq_file
  arm: use asm-generic/scatterlist.h
  ...
parents 7c7cbaf5 717e7c26

Documentation/arm/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ Samsung-S3C24XX 
	- S3C24XX ARM Linux Overview

Sharp-LH

	- Linux on Sharp LH79524 and LH7A40X System On a Chip (SOC)

SPEAr

	- ST SPEAr platform Linux Overview

VFP/

	- Release notes for Linux Kernel Vector Floating Point support code

empeg/

Documentation/arm/SPEAr/overview.txt

0 → 100644
+60 −0
Original line number Diff line number Diff line 
			SPEAr ARM Linux Overview

			==========================



Introduction

------------



  SPEAr (Structured Processor Enhanced Architecture).

  weblink : http://www.st.com/spear



  The ST Microelectronics SPEAr range of ARM9/CortexA9 System-on-Chip CPUs are

  supported by the 'spear' platform of ARM Linux. Currently SPEAr300,

  SPEAr310, SPEAr320 and SPEAr600 SOCs are supported. Support for the SPEAr13XX

  series is in progress.



  Hierarchy in SPEAr is as follows:



  SPEAr (Platform)

	- SPEAr3XX (3XX SOC series, based on ARM9)

		- SPEAr300 (SOC)

			- SPEAr300_EVB (Evaluation Board)

		- SPEAr310 (SOC)

			- SPEAr310_EVB (Evaluation Board)

		- SPEAr320 (SOC)

			- SPEAr320_EVB (Evaluation Board)

	- SPEAr6XX (6XX SOC series, based on ARM9)

		- SPEAr600 (SOC)

			- SPEAr600_EVB (Evaluation Board)

	- SPEAr13XX (13XX SOC series, based on ARM CORTEXA9)

		- SPEAr1300 (SOC)



  Configuration

  -------------



  A generic configuration is provided for each machine, and can be used as the

  default by

	make spear600_defconfig

	make spear300_defconfig

	make spear310_defconfig

	make spear320_defconfig



  Layout

  ------



  The common files for multiple machine families (SPEAr3XX, SPEAr6XX and

  SPEAr13XX) are located in the platform code contained in arch/arm/plat-spear

  with headers in plat/.



  Each machine series have a directory with name arch/arm/mach-spear followed by

  series name. Like mach-spear3xx, mach-spear6xx and mach-spear13xx.



  Common file for machines of spear3xx family is mach-spear3xx/spear3xx.c and for

  spear6xx is mach-spear6xx/spear6xx.c. mach-spear* also contain soc/machine

  specific files, like spear300.c, spear310.c, spear320.c and spear600.c.

  mach-spear* also contains board specific files for each machine type.





  Document Author

  ---------------



  Viresh Kumar, (c) 2010 ST Microelectronics

Documentation/feature-removal-schedule.txt

+0 −23
Original line number Diff line number Diff line
@@ -520,29 +520,6 @@ Who: Hans de Goede <hdegoede@redhat.com> 


----------------------------



What:	corgikbd, spitzkbd, tosakbd driver

When:	2.6.35

Files:	drivers/input/keyboard/{corgi,spitz,tosa}kbd.c

Why:	We now have a generic GPIO based matrix keyboard driver that

	are fully capable of handling all the keys on these devices.

	The original drivers manipulate the GPIO registers directly

	and so are difficult to maintain.

Who:	Eric Miao <eric.y.miao@gmail.com>



----------------------------



What:	corgi_ssp and corgi_ts driver

When:	2.6.35

Files:	arch/arm/mach-pxa/corgi_ssp.c, drivers/input/touchscreen/corgi_ts.c

Why:	The corgi touchscreen is now deprecated in favour of the generic

	ads7846.c driver. The noise reduction technique used in corgi_ts.c,

	that's to wait till vsync before ADC sampling, is also integrated into

	ads7846 driver now. Provided that the original driver is not generic

	and is difficult to maintain, it will be removed later.

Who:	Eric Miao <eric.y.miao@gmail.com>



----------------------------



What:	capifs

When:	February 2011

Files:	drivers/isdn/capi/capifs.*

MAINTAINERS

+66 −6
Original line number Diff line number Diff line
@@ -586,6 +586,12 @@ F: drivers/mtd/nand/bcm_umi_bch.c 
F:	drivers/mtd/nand/bcm_umi_hamming.c

F:	drivers/mtd/nand/nand_bcm_umi.h



ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT

M:	Anton Vorontsov <avorontsov@mvista.com>

S:	Maintained

F:	arch/arm/mach-cns3xxx/

T:	git git://git.infradead.org/users/cbou/linux-cns3xxx.git



ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE

M:	Hartley Sweeten <hsweeten@visionengravers.com>

M:	Ryan Mallon <ryan@bluewatersys.com>
@@ -775,11 +781,10 @@ M: Philipp Zabel <philipp.zabel@gmail.com> 
S:	Maintained



ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support

M:	Lennert Buytenhek <buytenh@marvell.com>

M:	Nicolas Pitre <nico@marvell.com>

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Nicolas Pitre <nico@fluxnic.net>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.marvell.com/orion

S:	Maintained

S:	Odd Fixes

F:	arch/arm/mach-loki/

F:	arch/arm/mach-kirkwood/

F:	arch/arm/mach-mv78xx0/
@@ -994,6 +999,20 @@ W: http://www.arm.linux.org.uk/ 
S:	Maintained

F:	arch/arm/vfp/



ARM/VOIPAC PXA270 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-pxa/vpac270.c

F:	arch/arm/mach-pxa/include/mach-pxa/vpac270.h



ARM/ZIPIT Z2 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-pxa/z2.c

F:	arch/arm/mach-pxa/include/mach-pxa/z2.h



ASC7621 HARDWARE MONITOR DRIVER

M:	George Joseph <george.joseph@fairview5.com>

L:	lm-sensors@lm-sensors.org
@@ -3635,7 +3654,8 @@ F: drivers/net/wireless/mwl8k.c 


MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER

M:	Nicolas Pitre <nico@fluxnic.net>

S:	Maintained

S:	Odd Fixes

F: drivers/mmc/host/mvsdio.*



MARVELL YUKON / SYSKONNECT DRIVER

M:	Mirko Lindner <mlindner@syskonnect.de>
@@ -5133,7 +5153,7 @@ F: mm/sl?b.c 


SMC91x ETHERNET DRIVER

M:	Nicolas Pitre <nico@fluxnic.net>

S:	Maintained

S:	Odd Fixes

F:	drivers/net/smc91x.*



SMSC47B397 HARDWARE MONITOR DRIVER
@@ -5264,6 +5284,46 @@ F: drivers/serial/sunsu.c 
F:	drivers/serial/sunzilog.c

F:	drivers/serial/sunzilog.h



SPEAR PLATFORM SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/plat-spear/



SPEAR3XX MACHINE SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/mach-spear3xx/



SPEAR6XX MACHINE SUPPORT

M:	Rajeev Kumar <rajeev-dlh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/mach-spear6xx/



SPEAR CLOCK FRAMEWORK SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/mach-spear*/clock.c

F:	arch/arm/mach-spear*/include/mach/clkdev.h

F:	arch/arm/plat-spear/clock.c

F:	arch/arm/plat-spear/include/plat/clock.h and clkdev.h



SPEAR PAD MULTIPLEXING SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

W:	http://www.st.com/spear

S:	Maintained

F:	arch/arm/plat-spear/include/plat/padmux.h

F:	arch/arm/plat-spear/padmux.c

F:	arch/arm/mach-spear*/spear*xx.c

F:	arch/arm/mach-spear*/include/mach/generic.h

F:	arch/arm/mach-spear3xx/spear3*0.c

F:	arch/arm/mach-spear3xx/spear3*0_evb.c

F:	arch/arm/mach-spear6xx/spear600.c

F:	arch/arm/mach-spear6xx/spear600_evb.c



SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER

M:	Roger Wolff <R.E.Wolff@BitWizard.nl>

S:	Supported

arch/arm/Kconfig

+98 −93
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config ARM 
	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION

	select GENERIC_ATOMIC64 if (!CPU_32v6K)

	select HAVE_OPROFILE

	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)

	select HAVE_ARCH_KGDB

	select HAVE_KPROBES if (!XIP_KERNEL)

	select HAVE_KRETPROBES if (HAVE_KPROBES)
@@ -21,6 +21,7 @@ config ARM 
	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_LZMA

	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

	help
@@ -42,6 +43,11 @@ config GENERIC_GPIO 


config GENERIC_TIME

	bool

	default y



config ARCH_USES_GETTIMEOFFSET

	bool

	default n



config GENERIC_CLOCKEVENTS

	bool
@@ -175,28 +181,6 @@ config ARM_L1_CACHE_SHIFT_6 
	help

	  Setting ARM L1 cache line size to 64 Bytes.



if OPROFILE



config OPROFILE_ARMV6

	def_bool y

	depends on CPU_V6 && !SMP

	select OPROFILE_ARM11_CORE



config OPROFILE_MPCORE

	def_bool y

	depends on CPU_V6 && SMP

	select OPROFILE_ARM11_CORE



config OPROFILE_ARM11_CORE

	bool



config OPROFILE_ARMV7

	def_bool y

	depends on CPU_V7 && !SMP

	bool



endif



config VECTORS_BASE

	hex

	default 0xffff0000 if MMU || CPU_HIGH_VECTOR
@@ -231,6 +215,7 @@ config ARCH_AAEC2000 
	select CPU_ARM920T

	select ARM_AMBA

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for systems based on the Agilent AAEC-2000
@@ -238,21 +223,22 @@ config ARCH_INTEGRATOR 
	bool "ARM Ltd. Integrator family"

	select ARM_AMBA

	select ARCH_HAS_CPUFREQ

	select HAVE_CLK

	select COMMON_CLKDEV

	select ICST525

	select ICST

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

	help

	  Support for ARM's Integrator platform.



config ARCH_REALVIEW

	bool "ARM Ltd. RealView family"

	select ARM_AMBA

	select HAVE_CLK

	select COMMON_CLKDEV

	select ICST307

	select GENERIC_TIME

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select PLAT_VERSATILE

	select ARM_TIMER_SP804

	select GPIO_PL061 if GPIOLIB

	help

	  This enables support for ARM Ltd RealView boards.
@@ -261,20 +247,33 @@ config ARCH_VERSATILE 
	bool "ARM Ltd. Versatile family"

	select ARM_AMBA

	select ARM_VIC

	select HAVE_CLK

	select COMMON_CLKDEV

	select ICST307

	select GENERIC_TIME

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select PLAT_VERSATILE

	select ARM_TIMER_SP804

	help

	  This enables support for ARM Ltd Versatile board.



config ARCH_VEXPRESS

	bool "ARM Ltd. Versatile Express family"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_TIMER_SP804

	select COMMON_CLKDEV

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select ICST

	select PLAT_VERSATILE

	help

	  This enables support for the ARM Ltd Versatile Express boards.



config ARCH_AT91

	bool "Atmel AT91"

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.
@@ -285,7 +284,6 @@ config ARCH_BCMRING 
	select CPU_V6

	select ARM_AMBA

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help
@@ -294,14 +292,23 @@ config ARCH_BCMRING 
config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x-based"

	select CPU_ARM720T

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for Cirrus Logic 711x/721x based boards.



config ARCH_CNS3XXX

	bool "Cavium Networks CNS3XXX family"

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select ARM_GIC

	help

	  Support for Cavium Networks CNS3XXX platform.



config ARCH_GEMINI

	bool "Cortina Systems Gemini"

	select CPU_FA526

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for the Cortina Systems Gemini family SoCs
@@ -310,6 +317,7 @@ config ARCH_EBSA110 
	select CPU_SA110

	select ISA

	select NO_IOPORT

	select ARCH_USES_GETTIMEOFFSET

	help

	  This is an evaluation board for the StrongARM processor available

	  from Digital. It has limited hardware on-board, including an
@@ -321,11 +329,10 @@ config ARCH_EP93XX 
	select CPU_ARM920T

	select ARM_AMBA

	select ARM_VIC

	select GENERIC_GPIO

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for the Cirrus EP93xx series of CPUs.
@@ -333,16 +340,15 @@ config ARCH_FOOTBRIDGE 
	bool "FootBridge"

	select CPU_SA110

	select FOOTBRIDGE

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.



config ARCH_MXC

	bool "Freescale MXC/iMX-based"

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

	help

	  Support for Freescale MXC/iMX-based family of processors
@@ -350,12 +356,9 @@ config ARCH_MXC 
config ARCH_STMP3XXX

	bool "Freescale STMP3xxx"

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select USB_ARCH_HAS_EHCI

	help

	  Support for systems based on the Freescale 3xxx CPUs.
@@ -365,7 +368,6 @@ config ARCH_NETX 
	select CPU_ARM926T

	select ARM_VIC

	select GENERIC_CLOCKEVENTS

	select GENERIC_TIME

	help

	  This enables support for systems based on the Hilscher NetX Soc
@@ -373,6 +375,7 @@ config ARCH_H720X 
	bool "Hynix HMS720x-based"

	select CPU_ARM720T

	select ISA_DMA_API

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for systems based on the Hynix HMS720x
@@ -393,7 +396,6 @@ config ARCH_IOP32X 
	select CPU_XSCALE

	select PLAT_IOP

	select PCI

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for Intel's 80219 and IOP32X (XScale) family of
@@ -405,7 +407,6 @@ config ARCH_IOP33X 
	select CPU_XSCALE

	select PLAT_IOP

	select PCI

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for Intel's IOP33X (XScale) family of processors.
@@ -415,6 +416,7 @@ config ARCH_IXP23XX 
	depends on MMU

	select CPU_XSC3

 	select PCI

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for Intel's IXP23xx (XScale) family of processors.
@@ -423,6 +425,7 @@ config ARCH_IXP2000 
	depends on MMU

	select CPU_XSCALE

	select PCI

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for Intel's IXP2400/2800 (XScale) family of processors.
@@ -431,7 +434,6 @@ config ARCH_IXP4XX 
	depends on MMU

	select CPU_XSCALE

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select DMABOUNCE if PCI

	help
@@ -441,6 +443,7 @@ config ARCH_L7200 
	bool "LinkUp-L7200"

	select CPU_ARM720T

	select FIQ

	select ARCH_USES_GETTIMEOFFSET

	help

	  Say Y here if you intend to run this kernel on a LinkUp Systems

	  L7200 Software Development Board which uses an ARM720T processor.
@@ -454,9 +457,7 @@ config ARCH_L7200 
config ARCH_DOVE

	bool "Marvell Dove"

	select PCI

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help
@@ -466,9 +467,7 @@ config ARCH_KIRKWOOD 
	bool "Marvell Kirkwood"

	select CPU_FEROCEON

	select PCI

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help
@@ -478,7 +477,6 @@ config ARCH_KIRKWOOD 
config ARCH_LOKI

	bool "Marvell Loki (88RC8480)"

	select CPU_FEROCEON

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help
@@ -488,9 +486,7 @@ config ARCH_MV78XX0 
	bool "Marvell MV78xx0"

	select CPU_FEROCEON

	select PCI

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help
@@ -502,9 +498,7 @@ config ARCH_ORION5X 
	depends on MMU

	select CPU_FEROCEON

	select PCI

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help
@@ -515,11 +509,8 @@ config ARCH_ORION5X 
config ARCH_MMP

	bool "Marvell PXA168/910/MMP2"

	depends on MMU

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select PLAT_PXA
@@ -529,8 +520,8 @@ config ARCH_MMP 
config ARCH_KS8695

	bool "Micrel/Kendin KS8695"

	select CPU_ARM922T

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	help

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

	  System-on-Chip devices.
@@ -539,7 +530,6 @@ config ARCH_NS9XXX 
	bool "NetSilicon NS9xxx"

	select CPU_ARM926T

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	help
@@ -552,10 +542,7 @@ config ARCH_W90X900 
	bool "Nuvoton W90X900 CPU"

	select CPU_ARM926T

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_GPIO

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for Nuvoton (Winbond logic dept.) ARM9 processor,
@@ -569,7 +556,6 @@ config ARCH_W90X900 
config ARCH_NUC93X

	bool "Nuvoton NUC93X CPU"

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	help

	  Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a
@@ -578,8 +564,8 @@ config ARCH_NUC93X 
config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for Philips PNX4008 mobile platform.
@@ -588,11 +574,8 @@ config ARCH_PXA 
	depends on MMU

	select ARCH_MTD_XIP

	select ARCH_HAS_CPUFREQ

	select GENERIC_GPIO

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select PLAT_PXA
@@ -601,14 +584,14 @@ config ARCH_PXA 


config ARCH_MSM

	bool "Qualcomm MSM"

	select CPU_V6

	select GENERIC_TIME

	select HAVE_CLK

	select GENERIC_CLOCKEVENTS

	help

	  Support for Qualcomm MSM7K based systems.  This runs on the ARM11

	  apps processor of the MSM7K and depends on a shared memory

	  interface to the ARM9 modem processor which runs the baseband stack

	  and controls some vital subsystems (clock and power control, etc).

	  Support for Qualcomm MSM/QSD based systems.  This runs on the

	  apps processor of the MSM/QSD and depends on a shared memory

	  interface to the modem processor which runs the baseband

	  stack and controls some vital subsystems

	  (clock and power control, etc).



config ARCH_SHMOBILE

	bool "Renesas SH-Mobile"
@@ -625,6 +608,7 @@ config ARCH_RPC 
	select ISA_DMA_API

	select NO_IOPORT

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_USES_GETTIMEOFFSET

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -637,8 +621,6 @@ config ARCH_SA1100 
	select ARCH_MTD_XIP

	select ARCH_HAS_CPUFREQ

	select CPU_FREQ

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select TICK_ONESHOT
@@ -647,23 +629,28 @@ config ARCH_SA1100 
	  Support for StrongARM 11x0 based boards.



config ARCH_S3C2410

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, S3C2450"

	select GENERIC_GPIO

	select ARCH_HAS_CPUFREQ

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

	  the Samsung SMDK2410 development board (and derivatives).



	  Note, the S3C2416 and the S3C2450 are so close that they even share

	  the same SoC ID code. This means that there is no seperate machine

	  directory (no arch/arm/mach-s3c2450) as the S3C2416 was first.



config ARCH_S3C64XX

	bool "Samsung S3C64XX"

	select PLAT_SAMSUNG

	select CPU_V6

	select GENERIC_GPIO

	select ARM_VIC

	select HAVE_CLK

	select NO_IOPORT

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select SAMSUNG_CLKSRC
@@ -720,6 +707,7 @@ config ARCH_SHARK 
	select ISA_DMA

	select ZONE_DMA

	select PCI

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support for the StrongARM based Digital DNARD machine, also known

	  as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -729,6 +717,7 @@ config ARCH_LH7A40X 
	select CPU_ARM922T

	select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM

	select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM

	select ARCH_USES_GETTIMEOFFSET

	help

	  Say Y here for systems based on one of the Sharp LH7A40X

	  System on a Chip processors.  These CPUs include an ARM922T
@@ -742,9 +731,7 @@ config ARCH_U300 
	select HAVE_TCM

	select ARM_AMBA

	select ARM_VIC

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_GPIO

	help
@@ -754,9 +741,9 @@ config ARCH_U8500 
	bool "ST-Ericsson U8500 Series"

	select CPU_V7

	select ARM_AMBA

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for ST-Ericsson's Ux500 architecture
@@ -765,11 +752,8 @@ config ARCH_NOMADIK 
	select ARM_AMBA

	select ARM_VIC

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Nomadik platform by ST-Ericsson
@@ -777,11 +761,8 @@ config ARCH_NOMADIK 
config ARCH_DAVINCI

	bool "TI DaVinci"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select ZONE_DMA

	select HAVE_IDE

	select COMMON_CLKDEV
@@ -792,16 +773,24 @@ config ARCH_DAVINCI 


config ARCH_OMAP

	bool "TI OMAP"

	select GENERIC_GPIO

	select HAVE_CLK

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_HAS_HOLES_MEMORYMODEL

	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).



config PLAT_SPEAR

	bool "ST SPEAr"

	select ARM_AMBA

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	help

	  Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).



endchoice



#
@@ -817,6 +806,8 @@ source "arch/arm/mach-bcmring/Kconfig" 


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



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



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



source "arch/arm/mach-dove/Kconfig"
@@ -887,11 +878,13 @@ source "arch/arm/plat-samsung/Kconfig" 
source "arch/arm/plat-s3c24xx/Kconfig"

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

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

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



if ARCH_S3C2410

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

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

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

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

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

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

endif
@@ -920,6 +913,8 @@ source "arch/arm/mach-ux500/Kconfig" 


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



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



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



# Definitions to make life easier
@@ -929,7 +924,6 @@ config ARCH_ACORN 
config PLAT_IOP

	bool

	select GENERIC_CLOCKEVENTS

	select GENERIC_TIME



config PLAT_ORION

	bool
@@ -937,6 +931,12 @@ config PLAT_ORION 
config PLAT_PXA

	bool



config PLAT_VERSATILE

	bool



config ARM_TIMER_SP804

	bool



source arch/arm/mm/Kconfig



config IWMMXT
@@ -1065,6 +1065,10 @@ config PCI 
	  your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or

	  VESA. If you have PCI, say Y, otherwise N.



config PCI_DOMAINS

	bool

	depends on PCI



config PCI_SYSCALL

	def_bool PCI
@@ -1093,10 +1097,11 @@ source "kernel/time/Kconfig" 
config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || ARCH_U8500)

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500)

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If
@@ -1277,7 +1282,7 @@ config HIGHPTE 


config HW_PERF_EVENTS

	bool "Enable hardware performance counter support for perf events"

	depends on PERF_EVENTS && CPU_HAS_PMU && (CPU_V6 || CPU_V7)

	depends on PERF_EVENTS && CPU_HAS_PMU

	default y

	help

	  Enable hardware performance counter support for perf events. If