diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-18 17:15:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-18 17:15:30 -0500 |
| commit | fdb0a1a67e131f07a308730c80d07e330211d2e0 (patch) | |
| tree | 4fbf35055fc965737c1ffdbcfe98d7ea8335f940 /arch/arm/mach-s3c2440/Kconfig | |
| parent | fc0b7a20368193e1f7cf1376624eed419b9c33e6 (diff) | |
| parent | 7bb56d01f111890414fbe35412698485b68ed468 (diff) | |
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/mach-s3c2440/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 0429d255b0d8..cde5ae9a4340 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
| @@ -29,8 +29,10 @@ menu "S3C2440 Machines" | |||
| 29 | config MACH_ANUBIS | 29 | config MACH_ANUBIS |
| 30 | bool "Simtec Electronics ANUBIS" | 30 | bool "Simtec Electronics ANUBIS" |
| 31 | select CPU_S3C2440 | 31 | select CPU_S3C2440 |
| 32 | select S3C24XX_DCLK | ||
| 32 | select PM_SIMTEC if PM | 33 | select PM_SIMTEC if PM |
| 33 | select HAVE_PATA_PLATFORM | 34 | select HAVE_PATA_PLATFORM |
| 35 | select S3C24XX_GPIO_EXTRA64 | ||
| 34 | help | 36 | help |
| 35 | Say Y here if you are using the Simtec Electronics ANUBIS | 37 | Say Y here if you are using the Simtec Electronics ANUBIS |
| 36 | development system | 38 | development system |
| @@ -38,7 +40,9 @@ config MACH_ANUBIS | |||
| 38 | config MACH_OSIRIS | 40 | config MACH_OSIRIS |
| 39 | bool "Simtec IM2440D20 (OSIRIS) module" | 41 | bool "Simtec IM2440D20 (OSIRIS) module" |
| 40 | select CPU_S3C2440 | 42 | select CPU_S3C2440 |
| 43 | select S3C24XX_DCLK | ||
| 41 | select PM_SIMTEC if PM | 44 | select PM_SIMTEC if PM |
| 45 | select S3C24XX_GPIO_EXTRA128 | ||
| 42 | help | 46 | help |
| 43 | Say Y here if you are using the Simtec IM2440D20 module, also | 47 | Say Y here if you are using the Simtec IM2440D20 module, also |
| 44 | known as the Osiris. | 48 | known as the Osiris. |