From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 14 Jun 2009 10:01:05 +0000 (+0100)
Subject: Merge branch 'stmp' into devel
X-Git-Tag: v4.13~23057^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=06099961002a813324d057a91695af7c72939da6;p=mirror_ubuntu-bionic-kernel.git

Merge branch 'stmp' into devel
---

06099961002a813324d057a91695af7c72939da6
diff --cc arch/arm/Kconfig
index 3473f8b8ede6,d17c801a1704..fee7c64ca723
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -673,8 -692,12 +686,10 @@@ source "arch/arm/mach-s3c6400/Kconfig
  source "arch/arm/mach-s3c6410/Kconfig"
  endif
  
+ source "arch/arm/plat-stmp3xxx/Kconfig"
+ 
  source "arch/arm/mach-lh7a40x/Kconfig"
  
 -source "arch/arm/mach-imx/Kconfig"
 -
  source "arch/arm/mach-h720x/Kconfig"
  
  source "arch/arm/mach-versatile/Kconfig"