From: Olof Johansson <olof@lixom.net>
Date: Mon, 1 Oct 2012 21:25:41 +0000 (-0700)
Subject: Merge branch 'next/cleanup2' into HEAD
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d3a0a95868a9669816da193bb284121df9031c8;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'next/cleanup2' into HEAD

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mach-bcmring/arch.c
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-tegra/dma.c
---

5d3a0a95868a9669816da193bb284121df9031c8
diff --cc arch/arm/Kconfig
index 7362c9216b6d,6de2c4fd7fa2..0e8e536029b5
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -347,35 -350,6 +347,23 @@@ config ARCH_AT9
  	  This enables support for systems based on Atmel
  	  AT91RM9200 and AT91SAM9* processors.
  
 +config ARCH_BCM2835
 +	bool "Broadcom BCM2835 family"
 +	select ARCH_WANT_OPTIONAL_GPIOLIB
 +	select ARM_AMBA
 +	select ARM_ERRATA_411920
 +	select ARM_TIMER_SP804
 +	select CLKDEV_LOOKUP
 +	select COMMON_CLK
 +	select CPU_V6
 +	select GENERIC_CLOCKEVENTS
 +	select MULTI_IRQ_HANDLER
 +	select SPARSE_IRQ
 +	select USE_OF
 +	help
 +	  This enables support for the Broadcom BCM2835 SoC. This SoC is
 +	  use in the Raspberry Pi, and Roku 2 devices.
 +
- config ARCH_BCMRING
- 	bool "Broadcom BCMRING"
- 	depends on MMU
- 	select CPU_V6
- 	select ARM_AMBA
- 	select ARM_TIMER_SP804
- 	select CLKDEV_LOOKUP
- 	select GENERIC_CLOCKEVENTS
- 	select ARCH_WANT_OPTIONAL_GPIOLIB
- 	help
- 	  Support for Broadcom's BCMRing platform.
- 
  config ARCH_HIGHBANK
  	bool "Calxeda Highbank-based"
  	select ARCH_WANT_OPTIONAL_GPIOLIB
diff --cc arch/arm/Makefile
index f47618252e5d,81ce4f749a14..a2eb4fe068b9
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -136,8 -136,6 +136,7 @@@ textofs-$(CONFIG_ARCH_MSM8960) := 0x002
  # Machine directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
  machine-$(CONFIG_ARCH_AT91)		:= at91
 +machine-$(CONFIG_ARCH_BCM2835)		:= bcm2835
- machine-$(CONFIG_ARCH_BCMRING)		:= bcmring
  machine-$(CONFIG_ARCH_CLPS711X)		:= clps711x
  machine-$(CONFIG_ARCH_CNS3XXX)		:= cns3xxx
  machine-$(CONFIG_ARCH_DAVINCI)		:= davinci