diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:04:06 +0200 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:04:06 +0200 |
commit | 5a5c419fe902458bfef936e32dc6472de04c56cf (patch) | |
tree | 2dac84e35702da9fde36e03e652980e29c198082 /arch/arm/mach-s3c2410/Kconfig | |
parent | ARM: Merge for-2635/samsung-clock (diff) | |
parent | ARM: n30: Just call s3c24xx_init_irq() directly from machine definition (diff) | |
download | linux-5a5c419fe902458bfef936e32dc6472de04c56cf.tar.xz linux-5a5c419fe902458bfef936e32dc6472de04c56cf.zip |
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 config MACH_N30 bool "Acer N30 family" select CPU_S3C2410 + select MACH_N35 select S3C_DEV_USB_HOST select S3C_DEV_NAND help Say Y here if you want suppt for the Acer N30, Acer N35, Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs. +config MACH_N35 + bool + help + Internal node in order to enable support for Acer N35 if Acer N30 is + selected. + config ARCH_BAST bool "Simtec Electronics BAST (EB2410ITX)" select CPU_S3C2410 |