linux-next: manual merge of the arm-soc tree with the arm tree

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit d0ee9f404f42 ("ARM: limit CONFIG_HAVE_IDE
to platforms that do") from the arm tree and commit 06a4eada6a73 ("ARM:
switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H") from the arm-soc
tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/Kconfig
index bb2b5ba,c1c9dc0..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -212,11 -212,20 +212,24 @@@ config ARM_PATCH_PHYS_VIR
  	  this feature (eg, building a kernel for a single machine) and
  	  you need to shrink the kernel to the minimal size.
  
+ config NEED_MACH_MEMORY_H
+ 	bool
+ 	help
+ 	  Select this when mach/memory.h is required to provide special
+ 	  definitions for this platform.  The need for mach/memory.h should
+ 	  be avoided when possible.
+ 
+ config PHYS_OFFSET
+ 	hex "Physical address of main memory"
+ 	depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H
+ 	help
+ 	  Please provide the physical address corresponding to the
+ 	  location of main memory in your system.
  
 +config GENERIC_BUG
 +	def_bool y
 +	depends on BUG
 +
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"
@@@ -386,7 -400,7 +404,8 @@@ config ARCH_FOOTBRIDG
  	select CPU_SA110
  	select FOOTBRIDGE
  	select GENERIC_CLOCKEVENTS
 +	select HAVE_IDE
+ 	select NEED_MACH_MEMORY_H
  	help
  	  Support for systems based on the DC21285 companion chip
  	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@@ -675,7 -703,7 +710,8 @@@ config ARCH_RP
  	select NO_IOPORT
  	select ARCH_SPARSEMEM_ENABLE
  	select ARCH_USES_GETTIMEOFFSET
 +	select HAVE_IDE
+ 	select NEED_MACH_MEMORY_H
  	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.
@@@ -694,7 -722,7 +730,8 @@@ config ARCH_SA110
  	select HAVE_SCHED_CLOCK
  	select TICK_ONESHOT
  	select ARCH_REQUIRE_GPIOLIB
 +	select HAVE_IDE
+ 	select NEED_MACH_MEMORY_H
  	help
  	  Support for StrongARM 11x0 based boards.
  
@@@ -841,7 -873,7 +882,8 @@@ config ARCH_U30
  	select CLKDEV_LOOKUP
  	select HAVE_MACH_CLKDEV
  	select GENERIC_GPIO
 +	select ARCH_REQUIRE_GPIOLIB
+ 	select NEED_MACH_MEMORY_H
  	help
  	  Support for ST-Ericsson U300 series mobile platforms.

Attachment: pgp00000.pgp
Description: PGP signature