projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c31791 c11c221)
Merge branch 'stmp' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 14 Jun 2009 10:01:05 +0000 (11:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 14 Jun 2009 10:01:05 +0000 (11:01 +0100)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
index 3473f8b,d17c801..fee7c64
--- 1/arch/arm/Kconfig
--- 2/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"
diff --cc arch/arm/Makefile
Simple merge
Domain: System / Kernel;