From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 18 Dec 2008 14:52:00 +0000 (+0000)
Subject: Merge branch 'next-s3c24xx' into next-merged
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c6ad115876763e4f15055982ecb9579cb7abab5f;p=linux-beck.git

Merge branch 'next-s3c24xx' into next-merged
---

c6ad115876763e4f15055982ecb9579cb7abab5f
diff --cc arch/arm/mach-s3c2440/Kconfig
index 402213dc5d85,57b9c57ff2b4..cde5ae9a4340
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@@ -29,9 -29,9 +29,10 @@@ menu "S3C2440 Machines
  config MACH_ANUBIS
  	bool "Simtec Electronics ANUBIS"
  	select CPU_S3C2440
+ 	select S3C24XX_DCLK
  	select PM_SIMTEC if PM
  	select HAVE_PATA_PLATFORM
 +	select S3C24XX_GPIO_EXTRA64
  	help
  	  Say Y here if you are using the Simtec Electronics ANUBIS
  	  development system
@@@ -39,8 -39,8 +40,9 @@@
  config MACH_OSIRIS
  	bool "Simtec IM2440D20 (OSIRIS) module"
  	select CPU_S3C2440
+ 	select S3C24XX_DCLK
  	select PM_SIMTEC if PM
 +	select S3C24XX_GPIO_EXTRA128
  	help
  	  Say Y here if you are using the Simtec IM2440D20 module, also
  	  known as the Osiris.