diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:06 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:06 -0400 |
| commit | 5a5c419fe902458bfef936e32dc6472de04c56cf (patch) | |
| tree | 2dac84e35702da9fde36e03e652980e29c198082 /arch/arm/mach-s3c2410/Kconfig | |
| parent | 71b4439657a135a9ca7d11bc4ae3105628ed1186 (diff) | |
| parent | 0c3767b161a91eab5b23d602d374b9c070c067a9 (diff) | |
ARM: Merge for-2635/acer-n35
Merge branch 'for-2635/acer-n35' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c2410/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c2410/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index ca5c3c62f37b..163b60e2af96 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig | |||
| @@ -95,12 +95,19 @@ config PM_H1940 | |||
| 95 | config MACH_N30 | 95 | config MACH_N30 |
| 96 | bool "Acer N30 family" | 96 | bool "Acer N30 family" |
| 97 | select CPU_S3C2410 | 97 | select CPU_S3C2410 |
| 98 | select MACH_N35 | ||
| 98 | select S3C_DEV_USB_HOST | 99 | select S3C_DEV_USB_HOST |
| 99 | select S3C_DEV_NAND | 100 | select S3C_DEV_NAND |
| 100 | help | 101 | help |
| 101 | Say Y here if you want suppt for the Acer N30, Acer N35, | 102 | Say Y here if you want suppt for the Acer N30, Acer N35, |
| 102 | Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs. | 103 | Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs. |
| 103 | 104 | ||
| 105 | config MACH_N35 | ||
| 106 | bool | ||
| 107 | help | ||
| 108 | Internal node in order to enable support for Acer N35 if Acer N30 is | ||
| 109 | selected. | ||
| 110 | |||
| 104 | config ARCH_BAST | 111 | config ARCH_BAST |
| 105 | bool "Simtec Electronics BAST (EB2410ITX)" | 112 | bool "Simtec Electronics BAST (EB2410ITX)" |
| 106 | select CPU_S3C2410 | 113 | select CPU_S3C2410 |