diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 09:52:00 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 09:52:00 -0500 |
| commit | c6ad115876763e4f15055982ecb9579cb7abab5f (patch) | |
| tree | 75d2b0f5f31540ff8a2dcdde9e0f087b25c68868 /arch/arm/mach-s3c2440 | |
| parent | 1d19fdba149f4db055902c30b27adfb7d1ead058 (diff) | |
| parent | 28ab44c5be60a9b91021a7cc7b4e202775c04764 (diff) | |
Merge branch 'next-s3c24xx' into next-merged
Diffstat (limited to 'arch/arm/mach-s3c2440')
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 402213dc5d85..cde5ae9a4340 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
| @@ -29,6 +29,7 @@ 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 |
| 34 | select S3C24XX_GPIO_EXTRA64 | 35 | select S3C24XX_GPIO_EXTRA64 |
| @@ -39,6 +40,7 @@ config MACH_ANUBIS | |||
| 39 | config MACH_OSIRIS | 40 | config MACH_OSIRIS |
| 40 | bool "Simtec IM2440D20 (OSIRIS) module" | 41 | bool "Simtec IM2440D20 (OSIRIS) module" |
| 41 | select CPU_S3C2440 | 42 | select CPU_S3C2440 |
| 43 | select S3C24XX_DCLK | ||
| 42 | select PM_SIMTEC if PM | 44 | select PM_SIMTEC if PM |
| 43 | select S3C24XX_GPIO_EXTRA128 | 45 | select S3C24XX_GPIO_EXTRA128 |
| 44 | help | 46 | help |